From 07ed7ffdac346c000298dc564890698cd644aabf Mon Sep 17 00:00:00 2001
From: Tiago Kayaya <tiago.kayaya@equilibrium.local>
Date: Thu, 3 Dec 2020 11:01:16 +0100
Subject: [PATCH 1/8] merge to feature/publications

---
 src/app/pages/publications/gallery/gallery.page.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/pages/publications/gallery/gallery.page.ts b/src/app/pages/publications/gallery/gallery.page.ts
index c825ac2aa..bdcead0fa 100644
--- a/src/app/pages/publications/gallery/gallery.page.ts
+++ b/src/app/pages/publications/gallery/gallery.page.ts
@@ -20,5 +20,4 @@ export class GalleryPage implements OnInit {
 
   }
   
-
 }

From 42898fcb0e725124c3f221c089363adc2c06344d Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Thu, 17 Dec 2020 10:59:11 +0100
Subject: [PATCH 2/8] Module Actions stable version.

---
 src/app/home/home.page.html                   |  2 +-
 src/app/models/publication.ts                 |  2 +-
 .../approve-event-modal.page.html             |  2 +-
 .../new-action/new-action.page.html           |  4 ++--
 .../new-publication/new-publication.page.ts   | 14 ++++++++++----
 .../pages/publications/publications.page.html |  2 +-
 .../pages/publications/publications.page.ts   |  2 +-
 .../publication-detail.page.ts                | 19 +++++++++++++++----
 .../view-publications.page.ts                 |  6 ++++--
 9 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html
index dc266711b..269073e67 100644
--- a/src/app/home/home.page.html
+++ b/src/app/home/home.page.html
@@ -20,7 +20,7 @@
         </ion-tab-button>
         <ion-tab-button tab="publications">
           <ion-icon class="nav-icon" src="assets/images/icons-nav-actions.svg"></ion-icon>
-          <ion-label>Ações</ion-label>
+          <ion-label>Acções</ion-label>
         </ion-tab-button>
         <!-- <ion-tab-button tab="search">
           <ion-icon name="search"></ion-icon>
diff --git a/src/app/models/publication.ts b/src/app/models/publication.ts
index 873513361..6cfebc69f 100644
--- a/src/app/models/publication.ts
+++ b/src/app/models/publication.ts
@@ -1,12 +1,12 @@
 /* import { Image } from './image'; */
 
 export class Publication{
+    DateIndex: Date;
     DocumentId:string;
     ProcessId:string;
     Title: string;
     Message: string;
     DatePublication: Date;
-    /* image: Image; */
     OriginalFileName: string;
     FileBase64:string;
     FileExtension: string;
diff --git a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html
index 3dd5efff9..a0e503485 100644
--- a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html
+++ b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html
@@ -14,7 +14,7 @@
 <ion-menu autoHide="false" side="end" content-id="main-content">
   <ion-header>
     <ion-toolbar translucent>
-      <ion-title>Ações</ion-title>
+      <ion-title>Acções</ion-title>
     </ion-toolbar>
   </ion-header>
   <ion-content>
diff --git a/src/app/pages/publications/new-action/new-action.page.html b/src/app/pages/publications/new-action/new-action.page.html
index 7ac37fae9..8df1b933a 100644
--- a/src/app/pages/publications/new-action/new-action.page.html
+++ b/src/app/pages/publications/new-action/new-action.page.html
@@ -19,7 +19,7 @@
   <div class="content-container">
     <div class="title-content">
       <div class="div-title">
-        <ion-label class="title"> Nova Ação</ion-label>
+        <ion-label class="title"> Nova Acção</ion-label>
       </div>
       <div class="actionType">
         <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
@@ -82,7 +82,7 @@
         <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
       </div>
       <div class="ion-textarea-class">
-        <ion-textarea [(ngModel)]="folder.Detail" rows="12" cols="20" placeholder="Descrição da ação..."></ion-textarea>
+        <ion-textarea [(ngModel)]="folder.Detail" rows="12" cols="20" placeholder="Descrição da acção..."></ion-textarea>
       </div>
     </div>
   </div>
diff --git a/src/app/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts
index 5d912d9dc..ee3389064 100644
--- a/src/app/pages/publications/new-publication/new-publication.page.ts
+++ b/src/app/pages/publications/new-publication/new-publication.page.ts
@@ -52,6 +52,7 @@ export class NewPublicationPage implements OnInit {
     private publications: PublicationsService,
     private camera: Camera,
     ) {
+     
       this.publicationType = this.navParams.get('publicationType');
       this.folderId = this.navParams.get('folderId');
       this.publicationTitle = 'Nova Publicação';
@@ -106,8 +107,11 @@ export class NewPublicationPage implements OnInit {
 
   async save(){
     if(this.publicationType == '3'){
+      console.log(this.navParams.get('publication'));
+       
       if(this.capturedImage != ''){
         this.publication = {
+          DateIndex: this.publication.DateIndex,
           DocumentId:this.publication.DocumentId,
           ProcessId:this.publication.ProcessId,
           Title: this.pub.Title,
@@ -115,7 +119,7 @@ export class NewPublicationPage implements OnInit {
           DatePublication: this.publication.DatePublication,
           OriginalFileName: this.capturedImageTitle,
           FileBase64: this.capturedImage,
-          FileExtension: 'jpg',
+          FileExtension: 'jpeg',
         }
         console.log('Edit change image');
         console.log(this.publication);
@@ -124,14 +128,15 @@ export class NewPublicationPage implements OnInit {
       }
       else{
         this.publication = {
+          DateIndex: this.publication.DateIndex,
           DocumentId:this.publication.DocumentId,
           ProcessId:this.publication.ProcessId,
           Title: this.pub.Title,
           Message: this.pub.Message,
           DatePublication: this.publication.DatePublication,
-          OriginalFileName: '',
+          OriginalFileName: this.publication.OriginalFileName,
           FileBase64: this.publication.FileBase64,
-          FileExtension: 'jpg',
+          FileExtension: 'jpeg',
         }
         console.log('Edit - keep image');
         console.log(this.publication);
@@ -142,6 +147,7 @@ export class NewPublicationPage implements OnInit {
     else{
       
       this.publication = {
+        DateIndex: new Date(),
         DocumentId:null,
         ProcessId:this.folderId,
         Title: this.pub.Title,
@@ -149,7 +155,7 @@ export class NewPublicationPage implements OnInit {
         DatePublication: new Date(),
         OriginalFileName: this.capturedImageTitle,
         FileBase64: this.capturedImage,
-        FileExtension: 'jpg',
+        FileExtension: 'jpeg',
       }
       
       console.log('Create');
diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html
index a40b1b5ce..70e30b792 100644
--- a/src/app/pages/publications/publications.page.html
+++ b/src/app/pages/publications/publications.page.html
@@ -21,7 +21,7 @@
     <div class="main-header">
       <div class="title-content">
         <div class="div-title">
-          <ion-label class="title">Ações Presidenciais</ion-label>
+          <ion-label class="title">Acções Presidenciais</ion-label>
         </div>
         <div class="div-icon">
           <ion-icon (click)="AddPublicationFolder()" slot="end" src='assets/images/icons-add.svg'></ion-icon>
diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts
index 2881b7fe4..309357ee6 100644
--- a/src/app/pages/publications/publications.page.ts
+++ b/src/app/pages/publications/publications.page.ts
@@ -84,7 +84,7 @@ export class PublicationsPage implements OnInit {
           this.publicationsTravelFolderList.push(folder);
         }
       });
-      
+      this.showLoader = false;
     });
   }
 
diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts
index c9e88025e..29226a050 100644
--- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts
+++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts
@@ -24,6 +24,7 @@ export class PublicationDetailPage implements OnInit {
       this.publicationId = this.navParams.get('publicationId');
       this.folderId = this.navParams.get('folderIdId');
       this.publication = {
+        DateIndex: null,
         DocumentId: '',
         ProcessId:'',
         Title:'',
@@ -40,6 +41,13 @@ export class PublicationDetailPage implements OnInit {
     /* console.log(this.publication.FileBase64); */
     this.getPublicationDetail();
   }
+  doRefresh(event) {
+    this.getPublicationDetail();
+
+    setTimeout(() => {
+      event.target.complete();
+    }, 2000);
+  }
 
   getPublicationDetail(){
     this.showLoader = true;
@@ -47,15 +55,17 @@ export class PublicationDetailPage implements OnInit {
     console.log(this.folderId);
     this.publications.GetPublicationById(this.folderId,this.publicationId).subscribe(res=>{
       console.log(res);
+      /* this.publication = res; */
       this.publication = {
+        DateIndex: res.DateIndex,
         DocumentId: res.DocumentId,
         ProcessId:res.ProcessId,
         Title:res.Title,
         Message: res.Message,
         DatePublication: res.DatePublication,
         FileBase64: "data:image/jpg;base64," + res.FileBase64,
-        OriginalFileName: '',
-        FileExtension: '',
+        OriginalFileName: res.OriginalFileName,
+        FileExtension: 'jpeg',
       }
       this.showLoader = false;
     });
@@ -75,7 +85,6 @@ export class PublicationDetailPage implements OnInit {
 
   async editPost(publicationType:any) {
     console.log(this.publication);
-    
     const modal = await this.modalController.create({
       component: NewPublicationPage,
       componentProps:{
@@ -87,7 +96,9 @@ export class PublicationDetailPage implements OnInit {
     });
     await modal.present();
     modal.onDidDismiss().then(()=>{
-      this.getPublicationDetail();
+      setTimeout(() => {
+        this.getPublicationDetail();
+    }, 5000);
     });
   }
 
diff --git a/src/app/pages/publications/view-publications/view-publications.page.ts b/src/app/pages/publications/view-publications/view-publications.page.ts
index 522d3baa4..313a97078 100644
--- a/src/app/pages/publications/view-publications/view-publications.page.ts
+++ b/src/app/pages/publications/view-publications/view-publications.page.ts
@@ -35,8 +35,9 @@ export class ViewPublicationsPage implements OnInit {
     this.getPublications();
 
     setTimeout(() => {
-      /* event.target.complete(); */
-    }, 2000);
+      this.getPublications();
+      event.target.complete();
+    }, 3000);
   }
   close(){
     this.modalController.dismiss();
@@ -54,6 +55,7 @@ export class ViewPublicationsPage implements OnInit {
           format: 'png'
         }
         let item: Publication = {
+          "DateIndex": element.DateIndex,
           "DocumentId":element.DocumentId,
           "ProcessId":element.ProcessId,
           "Title":element.Title,

From c12040267972051f645eb817385ffec60cc9e358 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Thu, 17 Dec 2020 11:39:50 +0100
Subject: [PATCH 3/8] save

---
 src/app/pages/publications/publications.page.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts
index 309357ee6..dbde526c8 100644
--- a/src/app/pages/publications/publications.page.ts
+++ b/src/app/pages/publications/publications.page.ts
@@ -52,9 +52,10 @@ export class PublicationsPage implements OnInit {
     });
   }
   doRefresh(event) {
-    this.getActions();
+    /* this.getActions(); */
 
     setTimeout(() => {
+      this.getActions();
       event.target.complete();
     }, 2000);
   }
@@ -83,8 +84,8 @@ export class PublicationsPage implements OnInit {
         else{
           this.publicationsTravelFolderList.push(folder);
         }
+        this.showLoader = false;
       });
-      this.showLoader = false;
     });
   }
 

From 5d7f0d08be0c3dd9228a786cd6d2bbc5f9993903 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <you@example.com>
Date: Tue, 29 Dec 2020 10:15:47 +0100
Subject: [PATCH 4/8] Add custom scss function to conver px to em and rem

---
 src/function.scss | 60 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 src/function.scss

diff --git a/src/function.scss b/src/function.scss
new file mode 100644
index 000000000..818b0bb66
--- /dev/null
+++ b/src/function.scss
@@ -0,0 +1,60 @@
+
+// =============== Custom function ==============================
+
+// convert string number to int or double
+@function to-number($value) {
+    @if type-of($value) == 'number' {
+      @return $value;
+    } @else if type-of($value) != 'string' {
+      @error 'Value for `to-number` should be a number or a string.';
+    }
+  
+    $result: 0;
+    $digits: 0;
+    $minus: str-slice($value, 1, 1) == '-';
+    $numbers: ('0': 0, '1': 1, '2': 2, '3': 3, '4': 4, '5': 5, '6': 6, '7': 7, '8': 8, '9': 9);
+  
+    @for $i from if($minus, 2, 1) through str-length($value) {
+      $character: str-slice($value, $i, $i);
+  
+      @if (index(map-keys($numbers), $character) or $character == '.') {
+        @if $character == '.' {
+          $digits: 1; 
+        } @else if $digits == 0 {
+          $result: $result * 10 + map-get($numbers, $character);  
+        } @else {
+          $digits: $digits * 10;
+          $result: $result + map-get($numbers, $character) / $digits;
+        }
+      }
+    }
+  
+    @return if($minus, -$result, $result);;
+  }
+  
+  // convert px to rem
+  @function rem($size) {
+    $remSize: to-number($size) / 16;
+    //Default font size on html is 16px;
+    @return #{$remSize}rem;
+  }
+  
+  // convert px to em
+  @function em($size) {
+    $remSize: to-number($size) / 16px;
+    @return #{$remSize}em;
+  }
+  
+  // convert pt to rem
+  @function pt-rem($size) {
+    $pxSize:  to-number($size) * 1.328147;
+    $remSize: $pxSize / 16;
+    @return #{$remSize}rem;
+  }
+  
+  // convert pt to em
+  @function pt-em($size) {
+    $pxSize:  to-number($size) * 1.328147;
+    $remSize: $pxSize / 16;
+    @return #{$remSize}em;
+  }
\ No newline at end of file

From ea89cb205a35361361f2e1e30eae6ab6ff2ce456 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <you@example.com>
Date: Tue, 29 Dec 2020 10:17:34 +0100
Subject: [PATCH 5/8] Add responsive effect in shared header MD

---
 src/app/shared/header/header.page.html | 36 ++++++++++------
 src/app/shared/header/header.page.scss | 57 ++++++++++++++------------
 2 files changed, 54 insertions(+), 39 deletions(-)

diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html
index 49c3e1cac..3e9412eba 100644
--- a/src/app/shared/header/header.page.html
+++ b/src/app/shared/header/header.page.html
@@ -1,14 +1,26 @@
 <ion-toolbar class="bg-blue">
-  <div class="div-top-header">
-    <div class="div-search">
-      <ion-icon src='assets/images/icons-search.svg'></ion-icon>
-    </div>
-    <div class="div-logo">
-      <img src='assets/images/logo-no-bg.png' alt='logo'>
-    </div>
-    <div class="div-profile">
-      <ion-icon src='assets/images/icons-profile.svg'></ion-icon>
-    </div>
-  </div>
+  
+  <ion-grid>
+  
+    <ion-row class="div-top-header ion-justify-content-between">
+      <ion-col>
+        <div class="div-search">
+          <ion-icon src='assets/images/icons-search.svg'></ion-icon>
+        </div>
+      </ion-col>
+      <ion-col>
+        <div class="div-logo">
+          <img src='assets/images/logo-no-bg.png' alt='logo'>
+        </div>
+      </ion-col>
+      <ion-col>
+        <div class="div-profile">
+          <ion-icon src='assets/images/icons-profile.svg'></ion-icon>
+        </div>
+      </ion-col>
+    </ion-row>
+  
+  </ion-grid>
+  
 </ion-toolbar>
-
+  
\ No newline at end of file
diff --git a/src/app/shared/header/header.page.scss b/src/app/shared/header/header.page.scss
index cf8935c63..fdd23808c 100644
--- a/src/app/shared/header/header.page.scss
+++ b/src/app/shared/header/header.page.scss
@@ -1,28 +1,31 @@
-.div-top-header{
-    width: 400px;
-    margin: 0 auto;
-    background-color: #0782c9;
-    overflow: auto;
-    padding-top: 15px;
-    border: 0!important;
+@import '~src/function.scss';
 
-    .div-search{
-      font-size: 45px;
-      float: left;
-      margin: 0 0 0 10px
-    }
-    .div-logo{
-      background: transparent;
-      width: 140px;
-      margin: 5px 0 0px 71px;
-      float: left;
-    }
-    .div-logo img{
-      width: 100%;
-    }
-    .div-profile{
-      font-size: 45px;
-      float: right;
-      margin-right: 10px;
-    }
-  }
\ No newline at end of file
+.div-top-header{
+  margin: 0 auto;
+  background-color: #0782c9;
+  overflow: auto;
+  padding-top: 15px;
+  border: 0!important;
+
+  .div-search{
+    font-size: 45px;
+    margin: 0 0 0 10px
+  }
+  .div-logo{
+    background: transparent;
+    width: em(140px);
+    margin: 0px auto;
+    margin-top: 5px;
+    justify-content: center;
+    display: flex;
+  }
+  .div-logo img{
+    width: 100%;
+    margin: 0px auto;
+  }
+  .div-profile{
+    font-size: 45px;
+    float: right;
+    margin-right: 10px;
+  }
+}
\ No newline at end of file

From 9591688aa0b1911b69e31044eab0be6617fcc9ef Mon Sep 17 00:00:00 2001
From: Peter Maquiran <you@example.com>
Date: Tue, 29 Dec 2020 10:19:12 +0100
Subject: [PATCH 6/8] Remove unnecessary imports

---
 src/app/app.module.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index f721322e2..21fd97ea0 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -13,7 +13,7 @@ import { HttpClientModule } from '@angular/common/http';
 import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
 
 
-import { File } from '@ionic-native/File/ngx';
+//import { File } from '@ionic-native/File/ngx';
 import { WebView } from '@ionic-native/ionic-webview/ngx';
 import { FilePath } from '@ionic-native/file-path/ngx';
 import { Camera } from '@ionic-native/camera/ngx';
@@ -35,7 +35,7 @@ import { IonicStorageModule } from '@ionic/storage';
     { provide: RouteReuseStrategy, useClass: IonicRouteStrategy },
     InAppBrowser,
     Camera,
-    File,
+    //File,
     WebView,
     FilePath,
   ],

From 969d16915963276225a024838c9deabceccbe929 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <you@example.com>
Date: Tue, 29 Dec 2020 10:27:01 +0100
Subject: [PATCH 7/8] Change px unity to custom scss em fucntion

---
 src/app/shared/header/header.page.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/header/header.page.scss b/src/app/shared/header/header.page.scss
index fdd23808c..59eae0c69 100644
--- a/src/app/shared/header/header.page.scss
+++ b/src/app/shared/header/header.page.scss
@@ -4,7 +4,7 @@
   margin: 0 auto;
   background-color: #0782c9;
   overflow: auto;
-  padding-top: 15px;
+  padding-top: em(15px);
   border: 0!important;
 
   .div-search{
@@ -26,6 +26,6 @@
   .div-profile{
     font-size: 45px;
     float: right;
-    margin-right: 10px;
+    margin-right: em(10px);
   }
 }
\ No newline at end of file

From 97be93576859b88f09b18c9f3f8e1da836973710 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <you@example.com>
Date: Tue, 29 Dec 2020 11:09:46 +0100
Subject: [PATCH 8/8] Add shared component header MD in events page

---
 src/app/pages/events/events.module.ts |   2 +
 src/app/pages/events/events.page.html | 240 ++------------------------
 src/app/pages/events/events.page.scss |   9 +-
 3 files changed, 23 insertions(+), 228 deletions(-)

diff --git a/src/app/pages/events/events.module.ts b/src/app/pages/events/events.module.ts
index ce992f7a5..d88c468df 100644
--- a/src/app/pages/events/events.module.ts
+++ b/src/app/pages/events/events.module.ts
@@ -7,12 +7,14 @@ import { IonicModule } from '@ionic/angular';
 import { EventsPageRoutingModule } from './events-routing.module';
 
 import { EventsPage } from './events.page';
+import { SharedModule } from 'src/app/shared/shared.module';
 
 @NgModule({
   imports: [
     CommonModule,
     FormsModule,
     IonicModule,
+    SharedModule,
     EventsPageRoutingModule
   ],
   declarations: [EventsPage],
diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html
index 4592c1116..26b2e750b 100644
--- a/src/app/pages/events/events.page.html
+++ b/src/app/pages/events/events.page.html
@@ -1,234 +1,20 @@
 <ion-header class="ion-no-border">
-  <ion-toolbar class="ion-no-border" class="bg-blue">
-    <div class="div-top-header">
-    <div class="div-search">
-      <ion-icon src='assets/images/icons-search.svg'></ion-icon>
-    </div>
-    <div class="div-logo">
-      <img src='assets/images/logo-no-bg.png' alt='logo'>
-    </div>
-    <div class="div-profile">
-      <ion-icon src='assets/images/icons-profile.svg'></ion-icon>
-    </div>
-  </div>
-</ion-toolbar>
-</ion-header>
-<ion-header translucent="true">
-<ion-toolbar class="bg-blue">
-<ion-buttons slot="end">
-  <div class="toggleBox">
-    <div (click)="changeProfile()" class="toggle">
-      <input type="checkbox">
-      <label for="" class="onbtn">PR</label>
-      <label for="" class="ofbtn">MDGPR</label>
-    </div> 
-  </div>
-  </ion-buttons>
-</ion-toolbar>
-  <ion-toolbar class="bg-blue">
-    <ion-label>
-      <ion-item class="ion-text-right" lines="none">
-        <ion-label class="ion-text-wrap">
-            <h3 class="header-medium"> {{greetting}} Excelência <br />
-              Ministro Director do Gabinete do<!-- <br /> -->
-              Presidente da República
-            </h3>
-          
-        </ion-label>
-      </ion-item>
-    </ion-label>
-  </ion-toolbar>
-  <!-- TABS -->
-  <ion-toolbar>
-    <ion-segment [(ngModel)]="segment" (ionChange)="onSegmentChange()">
-      <ion-segment-button value="Combinada">
-        Combinada
-      </ion-segment-button>
-      <ion-segment-button value="Oficial">
-        Oficial
-      </ion-segment-button>
-      <ion-segment-button value="Pessoal">
-        Pessoal
-      </ion-segment-button>
-    </ion-segment>
-  </ion-toolbar>
+  <app-header></app-header>
 </ion-header>
 
-<ion-content >
+<ion-content class="main bg-blue">
   <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
+  
   <ion-label>
-    <p class="p-small">{{customDate}}</p>
+    <p class="p-small ion-text-center">{{customDate}}</p>
+  </ion-label>
+  <ion-label>
+    <p class="p-small ion-text-center"> <bold>5</bold> eventtos agendados para hoje</p>
   </ion-label>
-  <app-calendar></app-calendar>
-  <!-- <ion-item lines="none">
-    <ion-icon slot="start" src="assets/images/icons-agenda.svg"></ion-icon>
-    <label>A sua Agenda</label>
-  </ion-item> -->
-  <!-- COMBINADA -->
-  <div [ngSwitch]="segment">
-    <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-list *ngSwitchCase="'Combinada'" >
-      <ion-item-group>
-        <ion-item-sliding>
-          <ion-item lines="none" 
-          *ngFor="let event of eventsList"
-          [routerLink]="['/home/events', event.EventId, 'events']">
-            <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-list *ngSwitchCase="'Combinada'">
-      <div *ngIf="eventsList">
-        <ion-item-sliding>
-          <ion-item class="Rectangle" lines="none" 
-              *ngFor="let event of eventsList"
-              [routerLink]="['/home/events', event.EventId, 'events']">
-              <div class="content-{{profile}}-{{event.CalendarName}}">
-                <div class="approve-event-time">
-                  <p>{{event.StartDate | date: 'hh:mm'}}</p>
-                  <p>{{event.EndDate | date: 'hh:mm'}}</p>
-                </div>
-                <div class="approve-event-detail">
-                  <p>{{event.Location}}</p>
-                  <h3>{{event.Subject}}</h3>
-                </div>
-              </div>
-            </ion-item>
-        </ion-item-sliding>
-      </div>
-    </ion-list>
-    <!-- OFICIAL -->
-    <!-- <ion-list *ngSwitchCase="'Oficial'">
-      <ion-item-group>
-        <ion-item-sliding>
-          <ion-item lines="none" 
-          *ngFor="let event of officialeventsList"
-          [routerLink]="['/home/events', event.EventId, 'events']">
-            <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 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-list *ngSwitchCase="'Oficial'">
-      <div *ngIf="officialeventsList">
-        <ion-item-sliding>
-          <ion-item class="Rectangle" lines="none" 
-              *ngFor="let event of officialeventsList"
-              [routerLink]="['/home/events', event.EventId, 'events']">
-              <div class="content-{{profile}}-{{event.CalendarName}}">
-                <div class="approve-event-time">
-                  <p>{{event.StartDate | date: 'hh:mm'}}</p>
-                  <p>{{event.EndDate | date: 'hh:mm'}}</p>
-                </div>
-                <div class="approve-event-detail">
-                  <p>{{event.Location}}</p>
-                  <h3>{{event.Subject}}</h3>
-                </div>
-              </div>
-            </ion-item>
-        </ion-item-sliding>
-      </div>
-    </ion-list>
-    <!-- OFICIAL -->
-    <!-- <ion-list *ngSwitchCase="'Pessoal'">
-      <ion-item-group>
-        <ion-item-sliding>
-          <ion-item lines="none" 
-          *ngFor="let event of personaleventsList"
-          [routerLink]="['/home/events', event.EventId, 'events']">
-            <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 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-list *ngSwitchCase="'Pessoal'">
-      <div *ngIf="personaleventsList">
-        <ion-item-sliding>
-          <ion-item class="Rectangle" lines="none" 
-              *ngFor="let event of personaleventsList"
-              [routerLink]="['/home/events', event.EventId, 'events']">
-              <div class="content-{{profile}}-{{event.CalendarName}}">
-                <div class="approve-event-time">
-                  <p>{{event.StartDate | date: 'hh:mm'}}</p>
-                  <p>{{event.EndDate | date: 'hh:mm'}}</p>
-                </div>
-                <div class="approve-event-detail">
-                  <p>{{event.Location}}</p>
-                  <h3>{{event.Subject}}</h3>
-                </div>
-              </div>
-            </ion-item>
-        </ion-item-sliding>
-      </div>
-    </ion-list>
-  </div>
-</ion-content>
 
+  <div class="next-meeting">
+    <div class="meeting-time">08:30</div>
+    <div class="meeting-description">Reunião de Conselho de Ministros no Palácio Presidencial</div>
+  </div>
+
+</ion-content>
\ No newline at end of file
diff --git a/src/app/pages/events/events.page.scss b/src/app/pages/events/events.page.scss
index cae4ec29a..07435b4d8 100644
--- a/src/app/pages/events/events.page.scss
+++ b/src/app/pages/events/events.page.scss
@@ -266,4 +266,11 @@ ion-toolbar{
       bottom: 15px;
       right: 14px;
       color:  #e16817;
-    }
\ No newline at end of file
+    }
+
+
+.next-meeting{
+  display: flex;
+  justify-content: center;
+  margin: 0px auto;
+}
\ No newline at end of file