diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index 242ff2532..9de3185fa 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -9,19 +9,19 @@

{{customDate}}

-

{{totalEvent}} eventos agendados para hoje

+

{{totalEvent}} eventos agendados para hoje
{{hoursMinutes}}
-
Reunião de Conselho de Ministros no Palácio Presidencial
+
"{{currentEvent}}"
- +
A sua Agenda
@@ -59,7 +59,7 @@
- +
Correspondência por ler
@@ -69,11 +69,16 @@
  • - +
    +
    +
    {{task.CreateDate | date: 'd/M/yy'}}
    +
    {{task.CreateDate | date: 'hh:mm'}}
    +
    {{ task.Remetente }}
    {{ task.Folio }}
    +
diff --git a/src/app/pages/events/events.page.scss b/src/app/pages/events/events.page.scss index e6ca8de85..5df488337 100644 --- a/src/app/pages/events/events.page.scss +++ b/src/app/pages/events/events.page.scss @@ -367,6 +367,7 @@ ion-toolbar{ padding: 0px; margin: 0px; .d-flex{ + width: 100%; height: 40px; display: flex; justify-content: space-between; @@ -392,6 +393,11 @@ ion-toolbar{ font-size: 13px; } } + .schedule-date{ + width: 22%; + color: #797979 !important; + font-size: 13px; + } .schedule-details{ display: flex; flex-wrap: wrap; @@ -420,8 +426,8 @@ ion-toolbar{ } } li:last-child{ - //border-bottom: unset !important; - //padding-bottom: unset !important; + border-bottom: unset !important; + padding-bottom: unset !important; } } diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 39b0cc475..002c690a9 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -37,6 +37,7 @@ export class EventsPage implements OnInit { /* Set segment variable */ segment:string; public profile:string; + currentEvent: any; eventsList: Event[]; officialeventsList: Event[]; @@ -83,19 +84,20 @@ export class EventsPage implements OnInit { console.log(this.profile); // set event list - if(this.profile == "mdgpr"){ - this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => { + /* if(this.profile == "mdgpr"){ + this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => { this.eventsList = res; + console.log(this.eventsList); this.totalEvent = this.eventsList.length; }); } else{ - this.eventService.getAllPrEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => { + this.eventService.getAllPrEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => { this.eventsList = res; this.totalEvent = this.eventsList.length; }); - } + } */ this.showGreeting(); @@ -127,14 +129,18 @@ export class EventsPage implements OnInit { { case "Combinada": if(this.profile == "mdgpr"){ - this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => { + this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt') /* + ' 00:00:00' */, formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => { this.eventsList = res; + this.currentEvent = res[0].Subject; + this.totalEvent = this.eventsList.length; this.showLoader = false; }); }else{ this.eventService.getAllPrEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => { this.eventsList = res; console.log(this.eventsList); + this.currentEvent = res[0].Subject; + this.totalEvent = this.eventsList.length; this.showLoader = false; }); } diff --git a/src/assets/images/icons-correspondencias.svg b/src/assets/images/icons-correspondencias.svg new file mode 100644 index 000000000..306a41a35 --- /dev/null +++ b/src/assets/images/icons-correspondencias.svg @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/images/icons-nav-agenda-active.svg b/src/assets/images/icons-default-agenda.svg similarity index 100% rename from src/assets/images/icons-nav-agenda-active.svg rename to src/assets/images/icons-default-agenda.svg diff --git a/src/assets/images/icons-nav-agenda-bag.svg b/src/assets/images/icons-nav-agenda-bag.svg new file mode 100644 index 000000000..6edb5708b --- /dev/null +++ b/src/assets/images/icons-nav-agenda-bag.svg @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +