Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

src/app/pages/agenda/agenda.page.html

@@ -219,14 +219,15 @@
               <div *ngFor="let events of TimelineMDList | keyvalue;" >
                 
                 <div  class="EventListBox-container" *ngIf="CalendarCurrentDay <= events.key">
-                  <div class="day mt-10">
+                  <div class="day mt-10" *ngIf="shoeEventDay(events.value)">
                     {{ TimelineDayEvent(events.key)}}
                   </div>
   
-                  <div *ngFor="let event of events.value" class="EventListBox">
+                  <div *ngFor="let event of events.value" class="EventListBox"  >
 
                     <div class="d-flex content-{{event.profile}}-{{event.event.CalendarName}} mt-10 cursor-pointer width-100 " (click)="eventClicked(event)" 
-                      *ngIf="viewEventMonth <= dateMonth(event) && event.event.CalendarName == segment || segment == 'Combinado' ">
+                      *ngIf="viewEventMonth <= dateMonth(event) && showEventBox(event)">
+
                       <div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
 
                         <div *ngIf="!event.endMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
@@ -261,12 +262,13 @@
               <div *ngFor="let events of TimelineMDList | keyvalue;" >
                 
                 <div class="EventListBox-container" *ngIf="CalendarCurrentDay <= events.key">
-                  <div class="day EventListBox-day mt-10">
+                  <div class="day EventListBox-day mt-10"  *ngIf="shoeEventDay(events.value)">
                     {{ TimelineDayEvent(events.key)}}
                   </div>
-                  <div *ngFor="let event of events.value" class="EventListBox" >
+                  <div *ngFor="let event of events.value" class="EventListBox"  >
+                    
                     <div class="d-flex content-mdgpr-{{event.event.CalendarName}} mt-10 cursor-pointer" (click)="eventClicked(event)"
-                      *ngIf="viewEventMonth <= dateMonth(event) && event.event.CalendarName == segment || segment == 'Combinado' ">
+                      *ngIf="viewEventMonth <= dateMonth(event) && showEventBox(event)">
                   
                       <div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
                         <div *ngIf="!event.endMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
@@ -301,14 +303,14 @@
                 
                 <div class="EventListBox-container"  *ngIf="CalendarCurrentDay <= events.key">
                         
-                  <div class="day mt-10">
+                  <div class="day mt-10" *ngIf="shoeEventDay(events.value)">
                     {{ TimelineDayEvent(events.key)}}
                   </div>
 
-                  <div *ngFor="let event of events.value" class="EventListBox">
+                  <div *ngFor="let event of events.value" class="EventListBox"   >
 
                     <div class="d-flex content-pr-{{event.event.CalendarName}} mt-10 cursor-pointer" (click)="eventClicked(event)"
-                      *ngIf="viewEventMonth <= dateMonth(event) && event.event.CalendarName == segment || segment == 'Combinado' ">
+                      *ngIf="viewEventMonth <= dateMonth(event) &&  showEventBox(event) ">
                     
                       <div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
                         <div *ngIf="!event.endMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>

src/app/pages/agenda/agenda.page.ts

@@ -1135,6 +1135,7 @@ export class AgendaPage implements OnInit {
 
   // open component
   async viewEventDetail(eventId:any) {
+    console.log('View event '+eventId)
     this.router.navigate(['/home/agenda', eventId, 'agenda']);
     /* console.log(this.profile);
     
@@ -1310,6 +1311,15 @@ export class AgendaPage implements OnInit {
     }
     this.showTimelineFilterState = false;
 
+    setTimeout(()=>{
+      document.querySelectorAll('.EventListBox-container .EventListBox').forEach((e)=>{
+        if(e.childElementCount == 0) {
+          e.parentElement.style.display = 'none'
+        } else {
+          e.parentElement.style.display = 'block'
+        }
+      })
+    }, 10)
 
 
     setTimeout(()=>{
@@ -1320,8 +1330,29 @@ export class AgendaPage implements OnInit {
           e.parentElement.style.display = 'block'
         }
       })
-    }, 10)
+    }, 100)
     
   }
 
+  async showEventBox(event) {
+    
+    if ( event.event.CalendarName == this.segment || this.segment == 'Combinado') {
+      return true
+    }
+
+    return false
+  }
+
+
+  shoeEventDay(events: any[]) {
+
+    if ( this.segment == 'Combinado') {
+      return true;
+    }
+
+    const reuslt = events.filter((e)=> e.CalendarName == this.segment)
+
+    return reuslt.length != 0
+  }
+
 }

src/app/pages/agenda/view-event/view-event.page.ts

@@ -74,7 +74,7 @@ export class ViewEventPage implements OnInit {
   }
 
   ngOnInit() {
-    /* console.log(this.eventId); */
+    console.log('Notifi teste '+this.eventId);
     this.loadEvent();
     this.getAttachments();
 

src/app/pages/login/login.page.ts

@@ -114,7 +114,7 @@ export class LoginPage implements OnInit {
   } */
 
   getToken() {
-    // this.notificatinsservice.getAndpostToken(this.username);
+     this.notificatinsservice.getAndpostToken(this.username);
   }
 
   async Login() {
@@ -133,7 +133,7 @@ export class LoginPage implements OnInit {
         if (attempt) {
           //this.loginRocketChat();
           this.authService.loginChat(this.userattempt);
-          //this.getToken();
+          this.getToken();
 
           if(!this.pin) {
             this.setPint = true