From 78f8ab88598e8b067302242f730d73a66133c795 Mon Sep 17 00:00:00 2001
From: Tiago Kayaya <tiago.kayaya@equilibrium.local>
Date: Mon, 7 Sep 2020 12:12:05 +0100
Subject: [PATCH 01/22] Retified duplicated "Ver mais" issue

---
 .../event-detail/event-detail.page.html       | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 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 85eb180e8..b5484fde7 100644
--- a/src/app/pages/events/event-detail/event-detail.page.html
+++ b/src/app/pages/events/event-detail/event-detail.page.html
@@ -104,11 +104,12 @@
                   </ion-item>
                 </ion-list>
               </div>
-              <div *ngIf="i>1">
-                <ion-button class="see-more-button" fill="none" shape="round" (click)="openAttendees()">
-                  <ion-label color="secondary">Ver mais...</ion-label>
-                </ion-button>
-              </div>
+              
+            </div>
+            <div *ngIf="loadedEvent.Attendees.length  > 1">
+              <ion-button class="see-more-button" fill="none" shape="round" (click)="openAttendees()">
+                <ion-label color="secondary">Ver mais...</ion-label>
+              </ion-button>
             </div>
           </div>
         <div class="div-attach">
@@ -131,11 +132,11 @@
                 </ion-item>
               </ion-list>
             </div>
-            <div *ngIf="j>1">
-              <ion-button class="see-more-button" fill="none" shape="round" (click)="showAlert()">
-                <ion-label color="secondary">Ver mais...</ion-label>
-              </ion-button>
-            </div>
+          </div>
+          <div *ngIf="loadedEventAttachments.length > 1">
+            <ion-button class="see-more-button" fill="none" shape="round" (click)="showAlert()">
+              <ion-label color="secondary">Ver mais...</ion-label>
+            </ion-button>
           </div>
           
           <!-- Skeleton Attachment -->

From 74ce37adf3b041d173d0b849f89dc27f53b1ea5a Mon Sep 17 00:00:00 2001
From: Tiago Kayaya <tiago.kayaya@equilibrium.local>
Date: Mon, 7 Sep 2020 12:29:25 +0100
Subject: [PATCH 02/22] Retified goBack issue at event-detail page.

---
 src/app/pages/events/event-detail/event-detail.page.html | 7 +++++--
 1 file changed, 5 insertions(+), 2 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 b5484fde7..52b2570b0 100644
--- a/src/app/pages/events/event-detail/event-detail.page.html
+++ b/src/app/pages/events/event-detail/event-detail.page.html
@@ -95,6 +95,7 @@
               </ion-buttons>
               <ion-label class="attach-label">Participantes</ion-label>
             </ion-item>
+            <div *ngIf="loadedEvent.Attendees">
             <div *ngFor="let attendee of loadedEvent.Attendees; let i=index">
               <div *ngIf="i<2">
                 <ion-list >
@@ -106,12 +107,13 @@
               </div>
               
             </div>
-            <div *ngIf="loadedEvent.Attendees.length  > 1">
+            <div *ngIf="loadedEvent.Attendees.length > 1">
               <ion-button class="see-more-button" fill="none" shape="round" (click)="openAttendees()">
                 <ion-label color="secondary">Ver mais...</ion-label>
               </ion-button>
             </div>
           </div>
+          </div>
         <div class="div-attach">
           <ion-item>
             <ion-buttons slot="end" (click)="showAlert()">
@@ -119,6 +121,7 @@
             </ion-buttons>
             <ion-label class="attach-label">Anexos</ion-label>
           </ion-item>
+          <div *ngIf="loadedEventAttachments">
           <div *ngFor="let att of loadedEventAttachments; let j=index">
             <div *ngIf="j<2">
               <ion-list *ngIf="loadedEvent.HasAttachments">
@@ -138,7 +141,7 @@
               <ion-label color="secondary">Ver mais...</ion-label>
             </ion-button>
           </div>
-          
+        </div>
           <!-- Skeleton Attachment -->
         <ion-list *ngIf="!loadedEventAttachments">
           <ion-item lines="none" >

From cc88726c038df93e18b3f2794f5d93156cc002b2 Mon Sep 17 00:00:00 2001
From: Tiago Kayaya <tiago.kayaya@equilibrium.local>
Date: Mon, 7 Sep 2020 15:50:36 +0100
Subject: [PATCH 03/22] Working on attachments

---
 .../events/attachments/attachments.page.ts    |  1 +
 .../event-detail/event-detail.page.html       |  4 ++--
 .../events/event-detail/event-detail.page.ts  | 22 +++++++++++++------
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/app/pages/events/attachments/attachments.page.ts b/src/app/pages/events/attachments/attachments.page.ts
index 733310fa2..34c3db1aa 100644
--- a/src/app/pages/events/attachments/attachments.page.ts
+++ b/src/app/pages/events/attachments/attachments.page.ts
@@ -43,6 +43,7 @@ export class AttachmentsPage implements OnInit {
   }
 
   navigateBack(){
+    console.log(this.pageId);
     this.route.navigate(['/home/events',this.pageId]);
   }
 
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 52b2570b0..cd459ef54 100644
--- a/src/app/pages/events/event-detail/event-detail.page.html
+++ b/src/app/pages/events/event-detail/event-detail.page.html
@@ -126,7 +126,7 @@
             <div *ngIf="j<2">
               <ion-list *ngIf="loadedEvent.HasAttachments">
                 <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
-                <ion-item lines="none">
+                <ion-item lines="none" (click)="viewDocument(att.Link)">
                   <ion-icon name="attach" slot="start"></ion-icon>
                   <ion-label>
                       <p>{{ att.Description }}</p>
@@ -137,7 +137,7 @@
             </div>
           </div>
           <div *ngIf="loadedEventAttachments.length > 1">
-            <ion-button class="see-more-button" fill="none" shape="round" (click)="showAlert()">
+            <ion-button class="see-more-button" fill="none" shape="round" [routerLink]="['/home/attachments', loadedEvent.EventId]">
               <ion-label color="secondary">Ver mais...</ion-label>
             </ion-button>
           </div>
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 fa20e5ec6..86d36e8c2 100644
--- a/src/app/pages/events/event-detail/event-detail.page.ts
+++ b/src/app/pages/events/event-detail/event-detail.page.ts
@@ -11,6 +11,7 @@ import { AlertService } from 'src/app/services/alert.service';
 import { Attachment } from 'src/app/models/attachment.model';
 import { AttachmentsService } from 'src/app/services/attachments.service';
 import { FormGroup, FormBuilder, Validators } from "@angular/forms";
+import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
 
 
 @Component({
@@ -31,11 +32,15 @@ export class EventDetailPage implements OnInit {
   minDate: Date;
 
 
-  constructor(public formBuilder: FormBuilder, public alertController: AlertController, 
-    private router: Router, private activatedRoute: ActivatedRoute, 
-    private eventsService: EventsService, private modalCtrl: ModalController,
+  constructor(public formBuilder: FormBuilder, 
+    public alertController: AlertController, 
+    private router: Router, 
+    private activatedRoute: ActivatedRoute, 
+    private eventsService: EventsService, 
+    private modalCtrl: ModalController,
     private alertService: AlertService,
-    private attachamentsService: AttachmentsService) { 
+    private attachamentsService: AttachmentsService,
+    private iab: InAppBrowser) { 
     this.loadedEvent = new Event();
     this.loadedEvent.Body = new EventBody();
   }
@@ -180,9 +185,12 @@ export class EventDetailPage implements OnInit {
       this.loadedEventAttachments = attachments;
     });
   }
-
-  
-
+  async viewDocument(documenturl:string)
+  {
+    const url: string = documenturl.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1");
+    const browser = this.iab.create(url,"_blank");
+    browser.show();
+  }
 
   back()
   {

From 98132b27cf9a73dfddecb304a277010aad2d52a7 Mon Sep 17 00:00:00 2001
From: Tiago Kayaya <tiago.kayaya@equilibrium.local>
Date: Mon, 7 Sep 2020 16:37:23 +0100
Subject: [PATCH 04/22] Commented "Ver mais" at event-details for attachments

---
 src/app/pages/events/event-detail/event-detail.page.html | 4 ++--
 1 file changed, 2 insertions(+), 2 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 cd459ef54..f35246d9e 100644
--- a/src/app/pages/events/event-detail/event-detail.page.html
+++ b/src/app/pages/events/event-detail/event-detail.page.html
@@ -137,9 +137,9 @@
             </div>
           </div>
           <div *ngIf="loadedEventAttachments.length > 1">
-            <ion-button class="see-more-button" fill="none" shape="round" [routerLink]="['/home/attachments', loadedEvent.EventId]">
+           <!--  <ion-button class="see-more-button" fill="none" shape="round" [routerLink]="['/home/attachments', loadedEvent.EventId]">
               <ion-label color="secondary">Ver mais...</ion-label>
-            </ion-button>
+            </ion-button> -->
           </div>
         </div>
           <!-- Skeleton Attachment -->

From e33cf1ff31f7ad1f79a51457bc61cfa78f17e99f Mon Sep 17 00:00:00 2001
From: Tiago Kayaya <tiago.kayaya@equilibrium.local>
Date: Mon, 7 Sep 2020 17:17:09 +0100
Subject: [PATCH 05/22] Capitalized all events texts at home, agenda and
 eevent-details

---
 src/app/pages/agenda/agenda.page.scss              | 12 +++++-------
 .../pages/events/attachments/attachments.page.ts   |  8 ++++++--
 .../events/event-detail/event-detail.page.html     | 14 +++++++-------
 .../events/event-detail/event-detail.page.scss     |  1 +
 .../pages/events/event-detail/event-detail.page.ts |  4 ++++
 src/app/pages/events/events.page.html              | 12 ++++++------
 src/theme/variables.scss                           |  5 ++++-
 7 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss
index 0b7bb5111..e70e4aaf6 100644
--- a/src/app/pages/agenda/agenda.page.scss
+++ b/src/app/pages/agenda/agenda.page.scss
@@ -19,9 +19,11 @@
   .monthview-selected {
     background-color: lightskyblue !important;
   }
-  /* .item{
-    background: red !important;
-  } */
+  .item{
+    /* background: red !important; */
+    text-transform: capitalize;
+
+  }
   .input-wrapper{
     border-left: red !important;
     /* background: red; */
@@ -34,10 +36,6 @@
   border-radius: 15px;
 }
 
-.capitaliseText{
-    text-transform: capitalize;
-}
-
 
 
 /* TOGGLE button */
diff --git a/src/app/pages/events/attachments/attachments.page.ts b/src/app/pages/events/attachments/attachments.page.ts
index 34c3db1aa..6ed399924 100644
--- a/src/app/pages/events/attachments/attachments.page.ts
+++ b/src/app/pages/events/attachments/attachments.page.ts
@@ -14,7 +14,11 @@ export class AttachmentsPage implements OnInit {
   loadedEventAttachments: Attachment[];
   pageId: string;
 
-  constructor(private attachamentsService: AttachmentsService, private activatedRoute: ActivatedRoute, private iab: InAppBrowser, private route: Router) { }
+  constructor(
+    private attachamentsService: AttachmentsService, 
+    private activatedRoute: ActivatedRoute, 
+    private iab: InAppBrowser, 
+    private route: Router) { }
 
   ngOnInit() {
         /* Emit new data when something changes */
@@ -43,8 +47,8 @@ export class AttachmentsPage implements OnInit {
   }
 
   navigateBack(){
-    console.log(this.pageId);
     this.route.navigate(['/home/events',this.pageId]);
   }
 
+
 }
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 f35246d9e..51671f993 100644
--- a/src/app/pages/events/event-detail/event-detail.page.html
+++ b/src/app/pages/events/event-detail/event-detail.page.html
@@ -18,8 +18,8 @@
       <ion-item-sliding>
         <form [formGroup]="ionicForm" novalidate>
           <ion-item>
-            <ion-label position="stacked">Assunto</ion-label>
-            <ion-input [(ngModel)]="loadedEvent.Subject" formControlName="subject" type="text" required></ion-input>
+            <ion-label class="capitalizeText" position="stacked">Assunto</ion-label>
+            <ion-input class="capitalizeText"  [(ngModel)]="loadedEvent.Subject" formControlName="subject" type="text" required></ion-input>
           </ion-item>
           <!-- Error messages -->
           <span class="error ion-padding" *ngIf="errorControl.subject.errors?.required">
@@ -28,15 +28,15 @@
         </form>
         <ion-item>
           <ion-label position="stacked">Descrição</ion-label>
-          <ion-input [(ngModel)]='loadedEvent.Body.Text'></ion-input>
+          <ion-input class="capitalizeText" [(ngModel)]='loadedEvent.Body.Text'></ion-input>
         </ion-item>
         <ion-item>
           <ion-label position="stacked">Localização</ion-label>
-          <ion-input [(ngModel)]='loadedEvent.Location'></ion-input>
+          <ion-input class="capitalizeText" [(ngModel)]='loadedEvent.Location'></ion-input>
         </ion-item>
         <ion-item>
           <ion-label position="stacked">Calendário</ion-label>
-          <ion-select placeholder="{{loadedEvent.CalendarName}}" [(ngModel)]="loadedEvent.CalendarName" interface="action-sheet" class="custom-options" Cancel-text="Cancelar">
+          <ion-select class="capitalizeText" placeholder="{{loadedEvent.CalendarName}}" [(ngModel)]="loadedEvent.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>
@@ -101,7 +101,7 @@
                 <ion-list >
                   <ion-item class="attendees" lines="none" >
                       <ion-icon class="attendees-icon" name="person" slot="start"></ion-icon>
-                      <ion-label class="attendees-list">{{attendee.Name}}</ion-label> 
+                      <ion-label class="capitalizeText" class="attendees-list">{{attendee.Name}}</ion-label> 
                   </ion-item>
                 </ion-list>
               </div>
@@ -137,7 +137,7 @@
             </div>
           </div>
           <div *ngIf="loadedEventAttachments.length > 1">
-           <!--  <ion-button class="see-more-button" fill="none" shape="round" [routerLink]="['/home/attachments', loadedEvent.EventId]">
+            <!-- <ion-button class="see-more-button" fill="none" shape="round" [routerLink]="['/home/attachments', loadedEvent.EventId]">
               <ion-label color="secondary">Ver mais...</ion-label>
             </ion-button> -->
           </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 542a7d5fb..b94403c90 100644
--- a/src/app/pages/events/event-detail/event-detail.page.scss
+++ b/src/app/pages/events/event-detail/event-detail.page.scss
@@ -92,3 +92,4 @@ ion-card{
   text-transform: initial;
   font-size: 16px;
 }
+
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 86d36e8c2..d23df4533 100644
--- a/src/app/pages/events/event-detail/event-detail.page.ts
+++ b/src/app/pages/events/event-detail/event-detail.page.ts
@@ -40,6 +40,7 @@ export class EventDetailPage implements OnInit {
     private modalCtrl: ModalController,
     private alertService: AlertService,
     private attachamentsService: AttachmentsService,
+    private route: Router,
     private iab: InAppBrowser) { 
     this.loadedEvent = new Event();
     this.loadedEvent.Body = new EventBody();
@@ -204,4 +205,7 @@ export class EventDetailPage implements OnInit {
      }, 2000);
 
   }
+  navigateTo(ev){
+    this.route.navigate(['/home/events',ev]);
+  }
 }
diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html
index 72bfa3c5d..109550f72 100644
--- a/src/app/pages/events/events.page.html
+++ b/src/app/pages/events/events.page.html
@@ -72,7 +72,7 @@
                   <ion-icon slot="start" name="reader"></ion-icon>
                 </div>
                 <div class="div-content-{{event.CalendarName}}">
-                  <h3>{{event.Subject}}</h3>
+                  <h3 class="capitalizeText">{{event.Subject}}</h3>
                   <p>{{event.StartDate | date: 'hh:mm'}} - {{event.EndDate| date: 'hh:mm'}}</p>
                 </div>
               </div>
@@ -81,7 +81,7 @@
                   <ion-icon class="ion-icon-location" slot="start" name="location"></ion-icon>
                 </div>
                 <div class="div-botton-middle">
-                  <p class="item-list-small">{{event.Location}}</p>
+                  <p class="item-list-small capitalizeText">{{event.Location}}</p>
                 </div>
                 <div *ngIf="event.HasAttachments" class="div-botton-right">
                   <ion-icon class="ion-icon-attach" slot="end" name="attach-outline"></ion-icon>
@@ -105,7 +105,7 @@
                   <ion-icon slot="start" name="reader"></ion-icon>
                 </div>
                 <div class="div-content-{{event.CalendarName}}">
-                  <h3>{{event.Subject}}</h3>
+                  <h3 class="capitalizeText">{{event.Subject}}</h3>
                   <p>{{event.StartDate | date: 'hh:mm'}} - {{event.EndDate | date: 'hh:mm'}}</p>
                 </div>
               </div>
@@ -114,7 +114,7 @@
                   <ion-icon class="ion-icon-location" slot="start" name="location"></ion-icon>
                 </div>
                 <div class="div-botton-middle">
-                  <p class="item-list-small">{{event.Location}}</p>
+                  <p class="item-list-small capitalizeText">{{event.Location}}</p>
                 </div>
                 <div class="div-botton-right">
                   <ion-icon class="ion-icon-attach" slot="end" name="attach-outline"></ion-icon>
@@ -138,7 +138,7 @@
                   <ion-icon slot="start" name="reader"></ion-icon>
                 </div>
                 <div class="div-content-{{event.CalendarName}}">
-                  <h3>{{event.Subject}}</h3>
+                  <h3 class="capitalizeText">{{event.Subject}}</h3>
                   <p>{{event.StartDate | date: 'hh:mm' }} - {{event.EndDate | date: 'hh:mm'}}</p>
                 </div>
               </div>
@@ -147,7 +147,7 @@
                   <ion-icon class="ion-icon-location" slot="start" name="location"></ion-icon>
                 </div>
                 <div class="div-botton-middle">
-                  <p class="item-list-small">{{event.Location}}</p>
+                  <p class="item-list-small capitalizeText">{{event.Location}}</p>
                 </div>
                 <div class="div-botton-right">
                   <ion-icon class="ion-icon-attach" slot="end" name="attach-outline"></ion-icon>
diff --git a/src/theme/variables.scss b/src/theme/variables.scss
index 5154c732c..2c2589081 100644
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@@ -249,4 +249,7 @@
   --height: 80%;
   --border-radius: 10px;
   padding: 25px;
-} */
\ No newline at end of file
+} */
+.capitalizeText{
+  text-transform: capitalize;
+}
\ No newline at end of file

From 5a9eee018e10ef20d9090ad452f8f0aa3db0bbbd Mon Sep 17 00:00:00 2001
From: Tiago Kayaya <tiago.kayaya@equilibrium.local>
Date: Mon, 7 Sep 2020 17:25:38 +0100
Subject: [PATCH 06/22] =?UTF-8?q?Changed=20button=C2=B4s=20name.=20One=20t?=
 =?UTF-8?q?o=20"OK"=20and=20another=20to=20"Adicionar"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/pages/events/attendee-modal/attendee-modal.page.html | 2 +-
 src/app/pages/events/attendees/attendees.page.html           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/pages/events/attendee-modal/attendee-modal.page.html b/src/app/pages/events/attendee-modal/attendee-modal.page.html
index 2ca594b80..60a73dc46 100644
--- a/src/app/pages/events/attendee-modal/attendee-modal.page.html
+++ b/src/app/pages/events/attendee-modal/attendee-modal.page.html
@@ -31,7 +31,7 @@
     </ion-buttons>
     <ion-buttons slot="end">
       <ion-button (click)="save()">
-        <ion-label>Gravar</ion-label>
+        <ion-label>Adicionar</ion-label>
         <ion-icon name="checkmark" slot="start"></ion-icon>
       </ion-button>
     </ion-buttons>
diff --git a/src/app/pages/events/attendees/attendees.page.html b/src/app/pages/events/attendees/attendees.page.html
index 2e58fbda1..1be3f6046 100644
--- a/src/app/pages/events/attendees/attendees.page.html
+++ b/src/app/pages/events/attendees/attendees.page.html
@@ -49,7 +49,7 @@
     <ion-title></ion-title>
     <ion-buttons slot="end">
       <ion-button (click)="save()">
-        <ion-label>Gravar</ion-label>
+        <ion-label>OK</ion-label>
         <ion-icon name="checkmark" slot="start"></ion-icon>
       </ion-button>
     </ion-buttons>

From 7648d45dee0a13b6aaea3f610b9d69fdaad987cc Mon Sep 17 00:00:00 2001
From: Paulo Pinto <paulo.pinto@equilibrium.co.ao>
Date: Mon, 7 Sep 2020 17:31:14 +0100
Subject: [PATCH 07/22] Icone de Agenda fixo no Expediente

---
 .../pages/gabinete-digital/expediente/expediente.page.html   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.html b/src/app/pages/gabinete-digital/expediente/expediente.page.html
index 2ffeaac85..5f1bec52d 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.html
@@ -34,10 +34,11 @@
           <ion-item lines="none" *ngFor = "let task of taskslist" >
             <div class="div-content-expediente">
               <ion-item lines="none"  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]">
-                <ion-icon slot="end" name="document-outline"></ion-icon>
+                <ion-icon slot="end" name="calendar"></ion-icon>
                  <h3>{{ task.Folio }}</h3>
               </ion-item>
-              <p><span class="span-left">{{ task.Senders }}</span><span class="span-right">{{ task.CreateDate | date: 'dd-MM-yy' }}</span></p>
+              <p><span class="span-left">OAPR - GTI</span><span class="span-right">{{ task.CreateDate | date: 'dd-MM-yy' }}</span></p>
+              <!-- <p><span class="span-left">{{ task.Senders }}</span><span class="span-right">{{ task.CreateDate | date: 'dd-MM-yy' }}</span></p> -->
             </div>
           </ion-item>
         </ion-item-sliding>

From 4689b71b3ad049c8cdb8207ccbf1321d2237781a Mon Sep 17 00:00:00 2001
From: Paulo Pinto <paulo.pinto@equilibrium.co.ao>
Date: Tue, 8 Sep 2020 09:01:41 +0100
Subject: [PATCH 08/22] =?UTF-8?q?Integra=C3=A7=C3=A3o=20dos=20eventos=20de?=
 =?UTF-8?q?=20agenda=20no=20Expediente?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/models/attachment.model.ts            |  2 +-
 .../expediente-detail.page.html               | 32 +++++++++++++++++++
 .../expediente-detail.page.ts                 | 30 ++++++++++++++---
 src/app/services/attachments.service.ts       | 15 +++++++++
 4 files changed, 73 insertions(+), 6 deletions(-)

diff --git a/src/app/models/attachment.model.ts b/src/app/models/attachment.model.ts
index e2a14b1d5..c7d8a04ad 100644
--- a/src/app/models/attachment.model.ts
+++ b/src/app/models/attachment.model.ts
@@ -11,7 +11,7 @@ export class Attachment {
     //Data: any;
 }
 
-enum Sources
+export enum Sources
 {
     Undefined = 0,
     webTRIX = 1,
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
index 72d024021..937803520 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
@@ -27,6 +27,38 @@
       <ion-icon name="attach" slot="start"></ion-icon>
       Ver documento
     </ion-button>
+    <ion-list>
+      <ion-item-group>
+        <ion-item-sliding>
+          <ion-item lines="none" 
+          *ngFor="let event of eventsList"
+          [routerLink]="['/home/events', event.EventId, 'gabinete-digital/expediente/' + serialnumber]">
+            <div class="div-item-{{event.CalendarName}}">
+              <div class="div-up">
+                <div class="div-icon">
+                  <ion-icon slot="start" name="reader"></ion-icon>
+                </div>
+                <div class="div-content-{{event.CalendarName}}">
+                  <h3 class="capitalizeText">{{event.Subject}}</h3>
+                  <p>{{event.StartDate | date: 'hh:mm'}} - {{event.EndDate| date: 'hh:mm'}}</p>
+                </div>
+              </div>
+              <div class="div-botton">
+                <div class="div-botton-left">
+                  <ion-icon class="ion-icon-location" slot="start" name="location"></ion-icon>
+                </div>
+                <div class="div-botton-middle">
+                  <p class="item-list-small capitalizeText">{{event.Location}}</p>
+                </div>
+                <div *ngIf="event.HasAttachments" class="div-botton-right">
+                  <ion-icon class="ion-icon-attach" slot="end" name="attach-outline"></ion-icon>
+                </div>
+              </div>
+            </div>
+          </ion-item>
+        </ion-item-sliding>
+      </ion-item-group>
+    </ion-list>
   </ion-item-group>
 </div>
   <div *ngIf="!task">
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
index fe107dd68..22fb4a551 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
@@ -1,11 +1,12 @@
 import { Component, OnInit } from '@angular/core';
 import { ProcessesService } from 'src/app/services/processes.service';
+import { AttachmentsService } from 'src/app/services/attachments.service';
+import { EventsService } from 'src/app/services/events.service';
 import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
 import { DailyWorkTask } from '../../../../models/dailyworktask.model';
 import { ActivatedRoute } from '@angular/router';
 import { formatDate } from '@angular/common';
-import { LoadingService } from 'src/app/services/loading.service';
-
+import { Event } from '../../../../models/event.model';
 
 @Component({
   selector: 'app-expediente-detail',
@@ -16,10 +17,12 @@ export class ExpedienteDetailPage implements OnInit {
 
   constructor(private activateRoute: ActivatedRoute,
     private processes:ProcessesService,
-    private iab: InAppBrowser) { }
+    private iab: InAppBrowser,
+    private attachments: AttachmentsService,
+    private events: EventsService) { }
 
   task: DailyWorkTask;
-
+  eventsList: Event[];  
   serialnumber:string;
 
   ngOnInit() {
@@ -29,10 +32,11 @@ export class ExpedienteDetailPage implements OnInit {
       }
       this.serialnumber = paramMap.get('SerialNumber');
       this.LoadTaskDetail(this.serialnumber);
+      this.LoadRelatedEvents(this.serialnumber);
     });
   }
 
-  LoadTaskDetail(serial:string)
+  async LoadTaskDetail(serial:string)
   {
     this.processes.GetTask(serial).subscribe(result => {
       this.task = {
@@ -45,6 +49,22 @@ export class ExpedienteDetailPage implements OnInit {
     });
   }
 
+  async LoadRelatedEvents(serial:string)
+  {
+    this.eventsList = null;
+    this.attachments.getAttachments(2, serial).subscribe(result => {
+      result.forEach(att =>{
+        if (this.eventsList == null)
+        {
+          this.eventsList = new Array();
+        }
+        this.events.getEvent(att.ParentId).subscribe(event => {
+          this.eventsList.push(event);
+        });
+      });
+    });
+  }
+
   viewDocument()
   {
     const url: string = this.task.DocumentURL.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1");
diff --git a/src/app/services/attachments.service.ts b/src/app/services/attachments.service.ts
index c15eec509..1c2ab2f90 100644
--- a/src/app/services/attachments.service.ts
+++ b/src/app/services/attachments.service.ts
@@ -33,4 +33,19 @@ export class AttachmentsService {
 
     return this.http.get<Attachment[]>(`${geturl}`, options);
   }
+
+  getAttachments(source: number, sourceid: string): Observable<Attachment[]>{
+    let geturl = environment.apiURL + 'attachments/GetAttachments';
+    let params = new HttpParams();
+
+    params = params.set("Source", source.toString());
+    params = params.set("SourceId", sourceid);
+    
+    let options = { 
+      headers: this.headers, 
+      params: params 
+    };
+
+    return this.http.get<Attachment[]>(`${geturl}`, options);
+  }
 }

From 70833168f74814989796e444a449f528a0ef103e Mon Sep 17 00:00:00 2001
From: Tiago Kayaya <tiago.kayaya@equilibrium.local>
Date: Tue, 8 Sep 2020 09:40:25 +0100
Subject: [PATCH 09/22] Retified attachments call list at event-details

---
 .../events/attachments/attachments.page.html  | 33 ++-----------------
 .../events/attachments/attachments.page.ts    | 19 ++++-------
 .../event-detail/event-detail.page.html       |  4 +--
 .../events/event-detail/event-detail.page.ts  | 24 ++++++++++++++
 4 files changed, 35 insertions(+), 45 deletions(-)

diff --git a/src/app/pages/events/attachments/attachments.page.html b/src/app/pages/events/attachments/attachments.page.html
index a0df1b01b..93a33398e 100644
--- a/src/app/pages/events/attachments/attachments.page.html
+++ b/src/app/pages/events/attachments/attachments.page.html
@@ -1,7 +1,7 @@
 <ion-header>
   <ion-toolbar>
     <ion-buttons slot="start">
-      <ion-back-button (click)="navigateBack()" defaultHref="" icon="chevron-back"></ion-back-button>
+      <ion-back-button (click)="close()" defaultHref="" icon="chevron-back"></ion-back-button>
     </ion-buttons>
     <ion-title>Anexos do evento</ion-title>
   </ion-toolbar>
@@ -24,20 +24,7 @@
   </div>
   <!-- Skeleton screen -->
 <div *ngIf="!loadedEventAttachments">
-  <div class="ion-padding custom-skeleton">
-    <ion-skeleton-text animated style="width: 60%"></ion-skeleton-text>
-    <ion-skeleton-text animated></ion-skeleton-text>
-    <ion-skeleton-text animated style="width: 88%"></ion-skeleton-text>
-    <ion-skeleton-text animated style="width: 70%"></ion-skeleton-text>
-    <ion-skeleton-text animated style="width: 60%"></ion-skeleton-text>
-  </div>
-
   <ion-list>
-    <ion-list-header>
-      <ion-label>
-        <ion-skeleton-text animated style="width: 20%"></ion-skeleton-text>
-      </ion-label>
-    </ion-list-header>
     <ion-item>
       <ion-avatar slot="start">
         <ion-skeleton-text animated></ion-skeleton-text>
@@ -55,23 +42,9 @@
       </ion-label>
     </ion-item>
     <ion-item>
-      <ion-thumbnail slot="start">
+      <ion-avatar slot="start">
         <ion-skeleton-text animated></ion-skeleton-text>
-      </ion-thumbnail>
-      <ion-label>
-        <h3>
-          <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
-        </h3>
-        <p>
-          <ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
-        </p>
-        <p>
-          <ion-skeleton-text animated style="width: 60%"></ion-skeleton-text>
-        </p>
-      </ion-label>
-    </ion-item>
-    <ion-item>
-      <ion-skeleton-text animated style="width: 27px; height: 27px" slot="start"></ion-skeleton-text>
+      </ion-avatar>
       <ion-label>
         <h3>
           <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
diff --git a/src/app/pages/events/attachments/attachments.page.ts b/src/app/pages/events/attachments/attachments.page.ts
index 6ed399924..054eabf90 100644
--- a/src/app/pages/events/attachments/attachments.page.ts
+++ b/src/app/pages/events/attachments/attachments.page.ts
@@ -3,6 +3,7 @@ import { AttachmentsService } from 'src/app/services/attachments.service';
 import { Attachment } from 'src/app/models/attachment.model';
 import { ActivatedRoute, Router } from '@angular/router';
 import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
+import { ModalController, NavParams } from '@ionic/angular';
 
 @Component({
   selector: 'app-attachments',
@@ -16,19 +17,12 @@ export class AttachmentsPage implements OnInit {
 
   constructor(
     private attachamentsService: AttachmentsService, 
-    private activatedRoute: ActivatedRoute, 
     private iab: InAppBrowser, 
-    private route: Router) { }
+    private modalCtrl: ModalController,
+    private navParams: NavParams) { }
 
   ngOnInit() {
-        /* Emit new data when something changes */
-        this.activatedRoute.paramMap.subscribe(paramMap =>{
-          if(!paramMap.has('eventId')){
-            //Redirect
-            return;
-          }
-          this.loadAttachments(paramMap.get('eventId'));
-        });
+    this.loadAttachments(this.navParams.get('eventId'));
   }
 
   loadAttachments(eventid:string)
@@ -45,9 +39,8 @@ export class AttachmentsPage implements OnInit {
     const browser = this.iab.create(url,"_blank");
     browser.show();
   }
-
-  navigateBack(){
-    this.route.navigate(['/home/events',this.pageId]);
+  close(){
+    this.modalCtrl.dismiss(null);
   }
 
 
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 51671f993..698d4a4de 100644
--- a/src/app/pages/events/event-detail/event-detail.page.html
+++ b/src/app/pages/events/event-detail/event-detail.page.html
@@ -137,9 +137,9 @@
             </div>
           </div>
           <div *ngIf="loadedEventAttachments.length > 1">
-            <!-- <ion-button class="see-more-button" fill="none" shape="round" [routerLink]="['/home/attachments', loadedEvent.EventId]">
+            <ion-button class="see-more-button" fill="none" shape="round" (click)="openAttachments()"><!-- [routerLink]="['/home/attachments', loadedEvent.EventId]" -->
               <ion-label color="secondary">Ver mais...</ion-label>
-            </ion-button> -->
+            </ion-button>
           </div>
         </div>
           <!-- Skeleton Attachment -->
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 d23df4533..49cad3e11 100644
--- a/src/app/pages/events/event-detail/event-detail.page.ts
+++ b/src/app/pages/events/event-detail/event-detail.page.ts
@@ -12,6 +12,7 @@ import { Attachment } from 'src/app/models/attachment.model';
 import { AttachmentsService } from 'src/app/services/attachments.service';
 import { FormGroup, FormBuilder, Validators } from "@angular/forms";
 import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
+import { AttachmentsPage } from '../attachments/attachments.page';
 
 
 @Component({
@@ -208,4 +209,27 @@ export class EventDetailPage implements OnInit {
   navigateTo(ev){
     this.route.navigate(['/home/events',ev]);
   }
+  async openAttachments(){
+      const modal = await this.modalCtrl.create({
+        component: AttachmentsPage,
+         componentProps: {
+           eventId: this.pageId,
+          attachments: this.loadedEventAttachments
+        },
+        cssClass: 'attachments',
+        backdropDismiss: false
+      });
+  
+      await modal.present();
+  
+      modal.onDidDismiss().then((data) => {
+        if (data['data'] != null)
+        { 
+          let newattendees: EventPerson[] = data['data'];
+          this.loadedEvent.Attendees = newattendees;
+        }
+      });
+
+  }
+  
 }

From 8ddd262d862a079924a6d2f5aaf1db364be3e6cd Mon Sep 17 00:00:00 2001
From: Paulo Pinto <paulo.pinto@equilibrium.co.ao>
Date: Tue, 8 Sep 2020 09:42:34 +0100
Subject: [PATCH 10/22] =?UTF-8?q?Events=20em=20Expediente=20-=20Correc?=
 =?UTF-8?q?=C3=A7=C3=B5es=201?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/home/home-routing.module.ts           | 14 ++++--------
 .../expediente-detail.page.html               |  2 +-
 .../expediente-detail.page.ts                 | 22 ++++++++++---------
 3 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts
index ea9eb57db..eda051408 100644
--- a/src/app/home/home-routing.module.ts
+++ b/src/app/home/home-routing.module.ts
@@ -18,16 +18,6 @@ const routes: Routes = [
           {
             path:':eventId/:caller',
             loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),
-            // children: [
-            //   {
-            //     path:'',
-            //     loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),
-            //   },
-            //   {
-            //     path:':caller',
-            //     loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),
-            //   }
-            // ]
           },
         ]
       },
@@ -89,6 +79,10 @@ const routes: Routes = [
               {
                 path:':SerialNumber',
                 loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module').then(m => m.ExpedienteDetailPageModule)
+              },
+              {
+                path:'events/:eventId/:caller',
+                loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),
               }
             ]
           }
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
index 937803520..4bb79c8c7 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
@@ -32,7 +32,7 @@
         <ion-item-sliding>
           <ion-item lines="none" 
           *ngFor="let event of eventsList"
-          [routerLink]="['/home/events', event.EventId, 'gabinete-digital/expediente/' + serialnumber]">
+          [routerLink]="['/home/gabinete-digital/expediente/events/', event.EventId, 'gabinete-digital/expediente/' + serialnumber]">
             <div class="div-item-{{event.CalendarName}}">
               <div class="div-up">
                 <div class="div-icon">
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
index 22fb4a551..98747d6d9 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
@@ -51,18 +51,20 @@ export class ExpedienteDetailPage implements OnInit {
 
   async LoadRelatedEvents(serial:string)
   {
-    this.eventsList = null;
-    this.attachments.getAttachments(2, serial).subscribe(result => {
-      result.forEach(att =>{
-        if (this.eventsList == null)
-        {
-          this.eventsList = new Array();
-        }
-        this.events.getEvent(att.ParentId).subscribe(event => {
-          this.eventsList.push(event);
+    if (this.eventsList == null)
+    {
+      this.attachments.getAttachments(2, serial).subscribe(result => {
+        result.forEach(att =>{
+          if (this.eventsList == null)
+          {
+            this.eventsList = new Array();
+          }
+          this.events.getEvent(att.ParentId).subscribe(event => {
+            this.eventsList.push(event);
+          });
         });
       });
-    });
+    }
   }
 
   viewDocument()

From eaf60aa187b31c280d1fcaa8b583ddf21b45128d Mon Sep 17 00:00:00 2001
From: Tiago Kayaya <tiago.kayaya@equilibrium.local>
Date: Tue, 8 Sep 2020 10:43:26 +0100
Subject: [PATCH 11/22] Stuled expedient-detail page

---
 .../expediente-detail.page.html               |  65 ++++++++--
 .../expediente-detail.page.scss               | 117 +++++++++++++++++-
 2 files changed, 170 insertions(+), 12 deletions(-)

diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
index 4bb79c8c7..a21478099 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
@@ -3,13 +3,13 @@
     <ion-buttons slot="start">
       <ion-back-button defaultHref="/expediente"></ion-back-button>
     </ion-buttons>
-    <ion-title>Detalhes do Processo</ion-title>
+    <ion-title>Expediente</ion-title>
   </ion-toolbar>
 </ion-header>
 
 <ion-content  padding>
   <div *ngIf="task">
-
+  <h3 class="h3-event-title">Detalhes do Expediente</h3>
   <ion-item-group>
     <ion-item>
       <ion-label position="stacked">Assunto</ion-label>
@@ -21,14 +21,16 @@
     </ion-item>
     <ion-item>
       <ion-label position="stacked">Data</ion-label>
-      <ion-input disabled="true" value=''>{{ task.CreateDate }}</ion-input>
+      <ion-input disabled="true" value=''>{{ task.CreateDate | date: 'dd-MM-yy | hh:mm'}}</ion-input>
     </ion-item>
-    <ion-button  (click)="viewDocument()" shape="round" expand="outline">
+    <ion-button  (click)="viewDocument()" shape="round" expand="block">
       <ion-icon name="attach" slot="start"></ion-icon>
       Ver documento
     </ion-button>
+  </ion-item-group>
+    <div *ngIf="eventsList">
+      <h3 class="h3-event-title">Eventos Associados</h3>
     <ion-list>
-      <ion-item-group>
         <ion-item-sliding>
           <ion-item lines="none" 
           *ngFor="let event of eventsList"
@@ -40,7 +42,7 @@
                 </div>
                 <div class="div-content-{{event.CalendarName}}">
                   <h3 class="capitalizeText">{{event.Subject}}</h3>
-                  <p>{{event.StartDate | date: 'hh:mm'}} - {{event.EndDate| date: 'hh:mm'}}</p>
+                  <p>{{event.StartDate | date: 'dd-MM-yy | hh:mm'}} - {{event.EndDate| date: 'hh:mm'}}</p>
                 </div>
               </div>
               <div class="div-botton">
@@ -57,9 +59,52 @@
             </div>
           </ion-item>
         </ion-item-sliding>
-      </ion-item-group>
     </ion-list>
-  </ion-item-group>
+  </div>
+  <div *ngIf="!eventsList"> 
+    <ion-list>
+      <ion-list-header>
+        <ion-label>
+          <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
+        </ion-label>
+      </ion-list-header>
+      <ion-item>
+        <ion-thumbnail slot="start">
+          <ion-skeleton-text animated></ion-skeleton-text>
+        </ion-thumbnail>
+        <ion-label>
+          <h3>
+            <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
+          </h3>
+          <p>
+            <ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
+          </p>
+          <p>
+            <ion-skeleton-text animated style="width: 60%"></ion-skeleton-text>
+          </p>
+        </ion-label>
+      </ion-item>
+      <ion-item>
+        <ion-thumbnail slot="start">
+          <ion-skeleton-text animated></ion-skeleton-text>
+        </ion-thumbnail>
+        <ion-label>
+          <h3>
+            <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
+          </h3>
+          <p>
+            <ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
+          </p>
+          <p>
+            <ion-skeleton-text animated style="width: 60%"></ion-skeleton-text>
+          </p>
+        </ion-label>
+      </ion-item>
+     
+    </ion-list>
+  </div>
+
+  
 </div>
   <div *ngIf="!task">
     <ion-list>
@@ -91,8 +136,8 @@
           </p>
         </ion-label>
       </ion-item>
-      <ion-button color="medium" shape="round" expand="outline">
-        <ion-icon color="medium" name="attach" slot="start"></ion-icon>
+      <ion-button color="medium" shape="round" expand="block">
+        <!-- <ion-icon color="medium" name="attach" slot="start"></ion-icon> -->
         <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
       </ion-button>
     </ion-list>
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss
index 5eeb63118..d4a4be041 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss
@@ -4,5 +4,118 @@ ion-item-group{
 ion-button{
     display: block;
     width: 80%;
-    margin: 15px auto;
-}
\ No newline at end of file
+    margin: 20px auto;
+}
+.h3-event-title{
+    padding: 15px 0 0px 25px;
+    font-weight: bold;
+}
+
+//DIV
+.div-item-Oficial{
+    width: 100%;
+    overflow: auto;
+    border-bottom: 1px solid #ccc;
+    margin: 10px 0 5px 0;
+    /* background: #cab0dc; */
+    /* border-radius: 20px; */
+    /* padding: 10px; */
+    /* box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); */
+  }
+  .div-item-Pessoal{
+    width: 100%;
+    overflow: auto;
+    border-bottom: 1px solid #ccc;
+    margin: 10px 0 5px 0;
+    /* background: #cbeecb; */
+    /* border-radius: 20px; */
+    /* padding: 10px; */
+    /* box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); */
+  }
+  .div-up{
+    width: 100%;
+    overflow: auto;
+  }
+  .div-up h3{
+    margin: 0;
+    padding: 0;
+    font-size: 17px;
+    width: 100%;
+  }
+  .div-icon{
+    width: 10%;
+    font-size: 22px;
+    float: left;
+    color: #808080;
+  }
+  .div-icon ion-icon{
+    display: block;
+    margin: 0 auto;
+  
+  }
+  .div-content-Oficial{
+    width: 85%;
+    float: left;
+    border-left: 4px solid #cab0dc;
+    padding: 0 0 0 12px;
+  }
+  .div-content-Pessoal{
+    width: 85%;
+    float: left;
+    border-left: 4px solid #cbeecb;
+    padding: 0 0 0 12px;
+  }
+  .div-content-Oficial h3, .div-content-Pessoal h3{
+    font-size: 14pt;
+    /* border: 1px solid red; */
+  }
+  .div-content-Oficial p, .div-content-Pessoal p{
+    font-size: 12pt;
+    color: rgb(94, 92, 92);
+    padding: 0 !important;
+    margin: 0 !important;
+  }
+  .div-botton{
+    width: 100%;
+    overflow: auto;
+    margin: 10px 0 5px 0;
+  }
+  .div-botton-left{
+    width: 10%;
+    float: left;
+  }
+  .ion-icon-location{
+    text-align: center;
+    display: block;
+    color: #000;
+    font-size: 16px;
+    margin: 0 auto;
+  }
+  .div-botton-middle{
+    width: 75%;
+    float: left;
+    margin-top: 0.5px;
+  }
+  .div-botton-middle p{
+    padding: 0;
+    margin: 0;
+  }
+  .div-botton-right{
+    width: 10%;
+    float: left;
+    margin: 0;
+    padding: 0;
+  }
+  .ion-icon-attach{
+    color: #666666;
+    font-size: 20px;
+  }
+/* TOGGLE BUTTON */
+  .switch {
+    position: relative;
+    display: inline-block;
+    width: 90px;
+    height: 34px;
+    float: right;
+    margin:20px 20px 0 0;
+  }
\ No newline at end of file

From 9c01c3ce36cb1c97c31c8bfcd64f924597d0dd17 Mon Sep 17 00:00:00 2001
From: Tiago Kayaya <tiago.kayaya@equilibrium.local>
Date: Tue, 8 Sep 2020 10:45:18 +0100
Subject: [PATCH 12/22] save

---
 .../expediente/expediente-detail/expediente-detail.page.html | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
index a21478099..c27643d98 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
@@ -108,6 +108,11 @@
 </div>
   <div *ngIf="!task">
     <ion-list>
+      <ion-list-header>
+        <ion-label>
+          <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
+        </ion-label>
+      </ion-list-header>
       <ion-item>
         <ion-label>
           <h3>

From 67b6cc24c0ec5ef4bbff72fb269654198ce02f33 Mon Sep 17 00:00:00 2001
From: Tiago Kayaya <tiago.kayaya@equilibrium.local>
Date: Tue, 8 Sep 2020 10:57:31 +0100
Subject: [PATCH 13/22] Added OAPR-GTI at expediente-detail page

---
 .../expediente/expediente-detail/expediente-detail.page.html    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
index c27643d98..f1f69ae5d 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
@@ -17,7 +17,7 @@
     </ion-item>
     <ion-item>
       <ion-label position="stacked">Remetentes</ion-label>
-      <ion-input disabled="true">{{ task.Senders }}</ion-input>
+      <ion-input disabled="true">OAPR - GTI</ion-input><!-- {{ task.Senders }} -->
     </ion-item>
     <ion-item>
       <ion-label position="stacked">Data</ion-label>

From e132134ae7c960d1e5020d5bf126a02476fa2be8 Mon Sep 17 00:00:00 2001
From: Tiago Kayaya <tiago.kayaya@equilibrium.local>
Date: Tue, 8 Sep 2020 11:17:07 +0100
Subject: [PATCH 14/22] Added badge at tabBar

---
 src/app/home/home.page.html                 |  2 ++
 src/app/home/home.page.ts                   | 22 ++++++++++++++++++++-
 src/app/pages/cal-modal/cal-modal.page.scss |  5 ++++-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html
index 55b3fb3cc..32dc01bef 100644
--- a/src/app/home/home.page.html
+++ b/src/app/home/home.page.html
@@ -2,6 +2,7 @@
     <ion-tab-bar slot="bottom">
       <ion-tab-button tab="events">
         <ion-icon name="home"></ion-icon>
+        <ion-badge color="danger">{{totalEvent}}</ion-badge>
         <ion-label>Home</ion-label>
       </ion-tab-button>
   
@@ -11,6 +12,7 @@
       </ion-tab-button>
       <ion-tab-button tab="gabinete-digital">
           <ion-icon name="file-tray-stacked"></ion-icon>
+          <ion-badge color="danger">{{totalExpediente}}</ion-badge>
           <ion-label>Gabinete Digital</ion-label>
         </ion-tab-button>
         <!-- <ion-tab-button tab="search">
diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index 8aa0f78e9..75cf37236 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -1,4 +1,7 @@
 import { Component, OnInit } from '@angular/core';
+import { EventsService } from '../services/events.service';
+import { formatDate } from '@angular/common';
+import { Event } from '../models/event.model';
 
 @Component({
   selector: 'app-home',
@@ -6,10 +9,27 @@ import { Component, OnInit } from '@angular/core';
   styleUrls: ['./home.page.scss'],
 })
 export class HomePage implements OnInit {
+  eventsList: Event[];
+  totalEvent=0;
+  totalExpediente=2;
 
-  constructor() { }
+  constructor(private eventService: EventsService) { }
 
   ngOnInit() {
+    this.eventService.getAllEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59')
+        .subscribe(response => {
+            this.eventsList = response;
+            this.totalEvent = this.eventsList.length;
+          }
+        );
+
+
+
+
+
+
   }
 
+  
+
 }
diff --git a/src/app/pages/cal-modal/cal-modal.page.scss b/src/app/pages/cal-modal/cal-modal.page.scss
index 1fd02fb60..7236c8380 100644
--- a/src/app/pages/cal-modal/cal-modal.page.scss
+++ b/src/app/pages/cal-modal/cal-modal.page.scss
@@ -28,4 +28,7 @@
 } */
 .span-color{
     color:red;
-}
\ No newline at end of file
+}
+/* .ion-badge{
+    background: red;
+} */
\ No newline at end of file

From ad73458fd66fb6c6c24a77215f5c4c7e60ea9957 Mon Sep 17 00:00:00 2001
From: Tiago Kayaya <tiago.kayaya@equilibrium.local>
Date: Tue, 8 Sep 2020 11:25:00 +0100
Subject: [PATCH 15/22] Badge expediente is now dynamic

---
 src/app/home/home.page.ts                   | 13 ++++++-------
 src/app/pages/cal-modal/cal-modal.page.scss |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index 75cf37236..3a48431bf 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { EventsService } from '../services/events.service';
 import { formatDate } from '@angular/common';
 import { Event } from '../models/event.model';
+import { ProcessesService } from '../services/processes.service';
 
 @Component({
   selector: 'app-home',
@@ -11,9 +12,9 @@ import { Event } from '../models/event.model';
 export class HomePage implements OnInit {
   eventsList: Event[];
   totalEvent=0;
-  totalExpediente=2;
+  totalExpediente=0;
 
-  constructor(private eventService: EventsService) { }
+  constructor(private eventService: EventsService, private processesbackend:ProcessesService) { }
 
   ngOnInit() {
     this.eventService.getAllEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59')
@@ -23,11 +24,9 @@ export class HomePage implements OnInit {
           }
         );
 
-
-
-
-
-
+        this.processesbackend.GetTasksList("Expediente", true).subscribe(result =>{
+          this.totalExpediente = result;
+        });
   }
 
   
diff --git a/src/app/pages/cal-modal/cal-modal.page.scss b/src/app/pages/cal-modal/cal-modal.page.scss
index 7236c8380..e7a445d83 100644
--- a/src/app/pages/cal-modal/cal-modal.page.scss
+++ b/src/app/pages/cal-modal/cal-modal.page.scss
@@ -30,5 +30,5 @@
     color:red;
 }
 /* .ion-badge{
-    background: red;
+
 } */
\ No newline at end of file

From adbf9820b90bfd597d769ddc476be534da2f5715 Mon Sep 17 00:00:00 2001
From: Tiago Kayaya <tiago.kayaya@equilibrium.local>
Date: Tue, 8 Sep 2020 12:23:54 +0100
Subject: [PATCH 16/22] Styled badge size

---
 src/app/home/home.page.scss | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/src/app/home/home.page.scss b/src/app/home/home.page.scss
index e557817e3..e9d75a223 100644
--- a/src/app/home/home.page.scss
+++ b/src/app/home/home.page.scss
@@ -1,4 +1,28 @@
+
 ion-tab-bar{
     --background: #e3dfdf;
     --color: #000;
+}
+
+// Badge
+// --------------------------------------------------
+
+/// @prop - Font size of the badge
+$badge-font-size:15px !default;
+
+/// @prop - Font weight of the badge
+$badge-font-weight:bold !default;
+
+
+ion-badge {/*  */
+
+  /* display: inline-block;*/
+
+  min-width: 18px; 
+  font-size: $badge-font-size;
+  /* font-weight: $badge-font-weight;
+  line-height: 1;
+
+  white-space: nowrap;
+  vertical-align: baseline; */
 }
\ No newline at end of file

From 56c36876591ac3066f02619808bdb425efc06c0c Mon Sep 17 00:00:00 2001
From: Tiago Kayaya <tiago.kayaya@equilibrium.local>
Date: Tue, 8 Sep 2020 13:09:13 +0100
Subject: [PATCH 17/22] Fixed routerlink at Official and Pessoal list of events

---
 src/app/pages/events/events.page.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html
index 109550f72..615b31029 100644
--- a/src/app/pages/events/events.page.html
+++ b/src/app/pages/events/events.page.html
@@ -98,7 +98,7 @@
         <ion-item-sliding>
           <ion-item lines="none" 
           *ngFor="let event of officialeventsList"
-          [routerLink]="['/home/events', event.EventId]">
+          [routerLink]="['/home/events', event.EventId, 'events']">
             <div class="div-item-{{event.CalendarName}}">
               <div class="div-up">
                 <div class="div-icon">
@@ -131,7 +131,7 @@
         <ion-item-sliding>
           <ion-item lines="none" 
           *ngFor="let event of personaleventsList"
-          [routerLink]="['/home/events', event.EventId]">
+          [routerLink]="['/home/events', event.EventId, 'events']">
             <div class="div-item-{{event.CalendarName}}">
               <div class="div-up">
                 <div class="div-icon">

From 531c2df9a8bd1914586813d0b847f510c0f06f00 Mon Sep 17 00:00:00 2001
From: Tiago Kayaya <tiago.kayaya@equilibrium.local>
Date: Tue, 8 Sep 2020 14:28:39 +0100
Subject: [PATCH 18/22] save

---
 src/environments/environment.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index dd2e51b11..05a0eecbd 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: 'paulo.pinto',
+  defaultuser: '',
   defaultuserpwd: 'tabteste@006'
 };
 

From 385f8a4e572afefe2bcb7d2bca9b6d6e3ddc4d8f Mon Sep 17 00:00:00 2001
From: Tiago Kayaya <tiago.kayaya@equilibrium.local>
Date: Tue, 8 Sep 2020 14:28:57 +0100
Subject: [PATCH 19/22] save

---
 src/environments/environment.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 05a0eecbd..4fb899a73 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: '',
+  defaultuser: 'tiago.kayaya',
   defaultuserpwd: 'tabteste@006'
 };
 

From 967fd8bd03ea7971d4abd38e0a02899cc8b9a007 Mon Sep 17 00:00:00 2001
From: Tiago Kayaya <tiago.kayaya@equilibrium.local>
Date: Tue, 8 Sep 2020 15:02:06 +0100
Subject: [PATCH 20/22] 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 698d4a4de..e7878d3df 100644
--- a/src/app/pages/events/event-detail/event-detail.page.html
+++ b/src/app/pages/events/event-detail/event-detail.page.html
@@ -97,7 +97,7 @@
             </ion-item>
             <div *ngIf="loadedEvent.Attendees">
             <div *ngFor="let attendee of loadedEvent.Attendees; let i=index">
-              <div *ngIf="i<2">
+              <div *ngIf="i<1">
                 <ion-list >
                   <ion-item class="attendees" lines="none" >
                       <ion-icon class="attendees-icon" name="person" slot="start"></ion-icon>

From ef1bd31ef9102c1b88e19ff92411aa551ee9eb55 Mon Sep 17 00:00:00 2001
From: Tiago Kayaya <tiago.kayaya@equilibrium.local>
Date: Tue, 8 Sep 2020 15:04:21 +0100
Subject: [PATCH 21/22] save

---
 src/app/pages/agenda/agenda.page.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index 6045e135c..adce09a16 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -187,9 +187,9 @@
         </ng-template> 
 
       </div>
-      <ion-fab vertical="bottom" horizontal="end" slot="fixed">
+      <ion-fab vertical="bottom" horizontal="end" slot="fixed" (click)="openCalModal()">
         <ion-fab-button>
-          <ion-icon name="add" (click)="openCalModal()"></ion-icon>
+          <ion-icon name="add" ></ion-icon>
         </ion-fab-button>
       </ion-fab>
     </div>

From aa780a787478751aa015488b11bf0ce4ff388da3 Mon Sep 17 00:00:00 2001
From: Tiago Kayaya <tiago.kayaya@equilibrium.local>
Date: Tue, 8 Sep 2020 15:34:58 +0100
Subject: [PATCH 22/22] Added new card and changed order of the cards

---
 .../gabinete-digital.page.html                | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index 32b0879e8..f1cbcca57 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -31,15 +31,11 @@
 </ion-card>
 <ion-card color="#d4d5ca">
   <ion-card-header>
-    <ion-card-title>Diplomas</ion-card-title>
+    <ion-card-title>Expediente para o PR</ion-card-title>
     <ion-card-content>
       <ion-item (click)="notImplemented()" class="ion-item-change-color">
-        <ion-label>Assinados pelo PR</ion-label>
-        <ion-button slot="end">{{count_dip_apr}}</ion-button>
-      </ion-item>
-      <ion-item primary (click)="notImplemented()" class="ion-activated">
-        <ion-label>Por validar (MDGPR)</ion-label>
-        <ion-button slot="end">{{count_dip_pv}}</ion-button>
+        <ion-label>Correspondência</ion-label>
+        <ion-button slot="end">{{count_de_pr}}</ion-button>
       </ion-item>
     </ion-card-content>
   </ion-card-header>
@@ -55,4 +51,20 @@
     </ion-card-content>
   </ion-card-header>
 </ion-card>
+<ion-card color="#d4d5ca">
+  <ion-card-header>
+    <ion-card-title>Diplomas</ion-card-title>
+    <ion-card-content>
+      <ion-item (click)="notImplemented()" class="ion-item-change-color">
+        <ion-label>Assinados pelo PR</ion-label>
+        <ion-button slot="end">{{count_dip_apr}}</ion-button>
+      </ion-item>
+      <ion-item primary (click)="notImplemented()" class="ion-activated">
+        <ion-label>Por validar (MDGPR)</ion-label>
+        <ion-button slot="end">{{count_dip_pv}}</ion-button>
+      </ion-item>
+    </ion-card-content>
+  </ion-card-header>
+</ion-card>
+
 </ion-content>