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

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),
               }
             ]
           }

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">

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; */
 }

src/app/home/home.page.ts

@@ -1,4 +1,8 @@
 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',
@@ -6,10 +10,25 @@ import { Component, OnInit } from '@angular/core';
   styleUrls: ['./home.page.scss'],
 })
 export class HomePage implements OnInit {
+  eventsList: Event[];
+  totalEvent=0;
+  totalExpediente=0;
 
-  constructor() { }
+  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')
+        .subscribe(response => {
+            this.eventsList = response;
+            this.totalEvent = this.eventsList.length;
+          }
+        );
+
+        this.processesbackend.GetTasksList("Expediente", true).subscribe(result =>{
+          this.totalExpediente = result;
+        });
   }
 
+  
+
 }