Notificaion route for event aprovoal added

src/app/pages/agenda/agenda-routing.module.ts

@@ -1,15 +1,16 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-
-import { AgendaPage } from './agenda.page';
-
-const routes: Routes = [
-  {
-    path: '',
-    component: AgendaPage
-  },
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { AgendaPage } from './agenda.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: AgendaPage
+  },
+  {
     path: 'approve-event-modal',
-    path: 'approve-event-modal',
+    loadChildren: () => import('../gabinete-digital/event-list/approve-event-modal/approve-event-modal.module').then( m => m.ApproveEventModalPageModule)
   },
   {
     path: 'event-actions-popover',
@@ -32,10 +33,10 @@ const routes: Routes = [
     loadChildren: () => import('./view-event/view-event.module').then( m => m.ViewEventPageModule)
   }
 
-
-];
-
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule],
-})
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class AgendaPageRoutingModule {}

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

@@ -1,6 +1,7 @@
 import { Component, OnInit, ViewChild, Inject, LOCALE_ID } from '@angular/core';
 import { CalendarComponent } from 'ionic2-calendar';
 import { AlertController, ModalController } from '@ionic/angular';
+import { formatDate } from '@angular/common';
 import { CalModalPage } from '../cal-modal/cal-modal.page';
 import { EventsService } from 'src/app/services/events.service';
 import { Event } from '../../models/event.model';
@@ -8,7 +9,6 @@ import { Router, NavigationEnd } from '@angular/router';
 import { AlertService } from 'src/app/services/alert.service';
 import { NewEventPage } from './new-event/new-event.page';
 import { ViewEventPage } from './view-event/view-event.page';
-import { momentG }  from 'src/plugin/momentG'
 
 // showTimeline
 import { setHours, setMinutes } from 'date-fns';
@@ -119,9 +119,10 @@ export class AgendaPage implements OnInit {
     private alertCrontroller: AlertService
     ) {
 
-
-
-      this.timelineDate = momentG(new Date(),'dd MMMM yyyy');
+      // timeline inicial date
+      this.timelineDate = new Date().toLocaleString();
+      
+      //this.timelineDate = formatDate(new Date,'dd MMMM yyyy', 'pt');
 
 
       function setCookie(cname, cvalue, exdays) {
@@ -189,7 +190,7 @@ export class AgendaPage implements OnInit {
 
   onCurrentChanged = (ev: Date) => {
     // timeline change date
-    this.timelineDate = momentG(new Date(ev),'dd MMMM yyyy');
+    this.timelineDate = new Date(ev).toLocaleString();
     this.viewDate = new Date(ev);
     // calendar change date
     this.eventSelectedDate = new Date(ev);
@@ -200,15 +201,15 @@ export class AgendaPage implements OnInit {
 
   // changedate
   dropDownChangeDate(id: string){
-    const currentCandarDayYear = momentG(this.eventSelectedDate,'dd -- yyyy', 'pt');
+    /* const currentCandarDayYear = formatDate(this.eventSelectedDate,'dd -- yyyy', 'pt');
     const newDate = new Date(currentCandarDayYear.replace('--',id));
-    this.onCurrentChanged(newDate); 
+    this.onCurrentChanged(newDate); */
   }
 
-  onTimeSelected = (ev: { selectedTime: Date, events: any[] }) => {
+  /* onTimeSelected = (ev: { selectedTime: Date, events: any[] }) => {
         console.log('Selected time: ' + ev.selectedTime + ', hasEvents: ' + (ev.events !== undefined && ev.events.length !== 0));
         this.eventSelectedDate2 = ev.selectedTime;
-  }; 
+    }; */
 
   onRangeChanged (ev: { startTime: Date, endTime: Date }) {
     this.rangeStartDate = ev.startTime;
@@ -288,12 +289,8 @@ export class AgendaPage implements OnInit {
       const shadowRoot = timelineContainer.shadowRoot;
 
       const scrollContainer = shadowRoot.querySelector('main');
-      try {
-        scrollContainer.scrollTop = timelineMarker['offsetTop'] - ((scrollContainer.offsetHeight/2) - 60);
-      } catch (error) {
-        //
-      }
-      
+
+      scrollContainer.scrollTop = timelineMarker['offsetTop'] - ((scrollContainer.offsetHeight/2) - 60);
       
     }, timeout);
   }
@@ -301,7 +298,7 @@ export class AgendaPage implements OnInit {
   // for timeline
   timelineIsCurrentDate(): Boolean {
     return true;
-    //return momentG(new Date(),'dd MMMM yyyy', 'pt') == momentG(this.eventSelectedDate,'dd MMMM yyyy', 'pt');
+    //return formatDate(new Date(),'dd MMMM yyyy', 'pt') == formatDate(this.eventSelectedDate,'dd MMMM yyyy', 'pt');
   }
 
   // for timeline
@@ -368,11 +365,11 @@ export class AgendaPage implements OnInit {
     this.eventsList.forEach((element, eventIndex) => {
       
       // timeline start
-      const startHours =  momentG(new Date(element.StartDate), 'HH', 'pt');
-      const EndHours = momentG(new Date(element.EndDate), 'HH', 'pt');
+      const startHours =  new Date(element.StartDate).getHours().toLocaleString();
+      const EndHours = new Date(element.EndDate).getHours().toLocaleString();
 
-      const startHoursOtherFormate =  momentG(new Date(element.StartDate), 'HH:mm', 'pt');
-      const EndHoursOtherFormate = momentG(new Date(element.EndDate), 'HH:mm', 'pt');
+      const startHoursOtherFormate =  new Date(element.StartDate).getHours().toLocaleString()+':'+new Date(element.StartDate).getMinutes().toLocaleString();
+      const EndHoursOtherFormate = formatDate(new Date(element.EndDate), 'HH:mm', 'pt');
 
       if (element.CalendarName == calendarName) {
         this.events.push({
@@ -434,7 +431,7 @@ export class AgendaPage implements OnInit {
                 });
               });
 
-              this.timelineFilter(this.timelineFilterState);
+              // this.timelineFilter(this.timelineFilterState);
               
               this.myCal.update();
               this.myCal.loadEvents();
@@ -464,7 +461,7 @@ export class AgendaPage implements OnInit {
 
               });
 
-              this.timelineFilter(this.timelineFilterState);
+              // this.timelineFilter(this.timelineFilterState);
 
               this.myCal.update();
               this.myCal.loadEvents();

src/app/pages/events/events.page.ts

@@ -26,7 +26,6 @@ import { ExpedienteDetailPage } from '../gabinete-digital/expediente/expediente-
 export class EventsPage implements OnInit {
   /* Get current system date */
   today = new Date();
-  todayEnd = new Date();
   
   months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"];
   days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"];
@@ -77,8 +76,6 @@ export class EventsPage implements OnInit {
 
       // list
       this.LoadList();
-
-      this.todayEnd = new Date(new Date().getFullYear(), new Date().getMonth(), new Date().getDate(), 23, 59, 59);
       
      }
 
@@ -144,7 +141,7 @@ export class EventsPage implements OnInit {
     {
       case "Combinada":
         if(this.profile == "mdgpr"){
-          this.eventService.getAllMdEvents(this.today.toLocaleString(), this.todayEnd.toLocaleString()).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;
             
             if(res.length > 0){
@@ -155,7 +152,7 @@ export class EventsPage implements OnInit {
             this.showLoader = false;
            });
         }else{
-          this.eventService.getAllPrEvents(this.today.toLocaleString(), this.todayEnd.toLocaleString()).subscribe(res => {
+          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);
               console.log(res)
@@ -169,12 +166,12 @@ export class EventsPage implements OnInit {
         break;
       case "Pessoal":
         if(this.profile == "mdgpr"){
-         this.eventService.getAllMdEvents(this.today.toLocaleString(), this.todayEnd.toLocaleString()).subscribe(res => {
+         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.personaleventsList = res.filter(data => data.CalendarName == "Pessoal");
           this.showLoader = false;
          });
         }else{
-          this.eventService.getAllPrEvents(this.today.toLocaleString(), this.todayEnd.toLocaleString()).subscribe(res => {
+          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.personaleventsList = res.filter(data => data.CalendarName == "Pessoal");
             this.showLoader = false;
            });
@@ -183,12 +180,12 @@ export class EventsPage implements OnInit {
         break;
       case "Oficial":
         if(this.profile == "mdgpr"){
-           this.eventService.getAllMdEvents(this.today.toLocaleString(), this.todayEnd.toLocaleString()).subscribe(res => {
+           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.officialeventsList = res.filter(data => data.CalendarName == "Oficial");;
             this.showLoader = false;
            });
         }else{
-          this.eventService.getAllPrEvents(this.today.toLocaleString(), this.todayEnd.toLocaleString()).subscribe(res => {
+          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.officialeventsList = res.filter(data => data.CalendarName == "Oficial");;
             this.showLoader = false;
            });
@@ -279,7 +276,7 @@ export class EventsPage implements OnInit {
           "SerialNumber": element.serialNumber,
           "Folio": element.workflowInstanceFolio,
           "Senders": element.originator.email,
-          "CreateDate": new Date(element.taskStartDate).toLocaleString(),
+          "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
           "DocumentURL": element.formURL,
           "Remetente": element.workflowInstanceDataFields.Remetente
         }

src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts

@@ -1,12 +1,12 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, NgZone } from '@angular/core';
 import { Router } from '@angular/router';
 import { MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
 import { Event } from 'src/app/models/event.model';
 import { AlertService } from 'src/app/services/alert.service';
 import { AttachmentsService } from 'src/app/services/attachments.service';
 import { ProcessesService } from 'src/app/services/processes.service';
-import { EmendMessageModalPage } from '../emend-message-modal/emend-message-modal.page';
-import { EventActionsPopoverPage } from '../event-actions-popover/event-actions-popover.page';
+import { EmendMessageModalPage } from '../../../agenda/emend-message-modal/emend-message-modal.page';
+import { EventActionsPopoverPage } from '../../../agenda/event-actions-popover/event-actions-popover.page';
 
 @Component({
   selector: 'app-approve-event-modal',
@@ -34,6 +34,7 @@ export class ApproveEventModalPage implements OnInit {
     private popoverController: PopoverController,
     private menu: MenuController,
     private alertService: AlertService,
+    private ngZone: NgZone,
     )
     {
       this.serialNumber = this.navParams.get('serialNumber');
@@ -49,7 +50,7 @@ export class ApproveEventModalPage implements OnInit {
   }
 
   close(){
-    this.router.navigate(['/home/gabinete-digital/event-list']);
+    this.ngZone.run(() => { this.router.navigate(['/home/gabinete-digital/event-list'])});
     this.modalController.dismiss(null);
   }
 
@@ -68,7 +69,7 @@ export class ApproveEventModalPage implements OnInit {
     console.log(body);
     this.processes.PostTaskAction(body);
     this.alertService.presentAlert('Operação realizada com sucesso!');
-    this.router.navigate(['/home/gabinete-digital/event-list']);
+    this.ngZone.run(() => { this.router.navigate(['/home/gabinete-digital/event-list'])});
     this.modalController.dismiss(null);
   }
 
@@ -85,7 +86,7 @@ export class ApproveEventModalPage implements OnInit {
     console.log(body);
     this.processes.PostTaskAction(body);
     this.alertService.presentAlert('Operação realizada com sucesso!');
-    this.router.navigate(['/home/gabinete-digital/event-list']);
+    this.ngZone.run(() => {this.router.navigate(['/home/gabinete-digital/event-list']);})
     this.modalController.dismiss(null);
   }
   getAttachments(){
@@ -129,7 +130,7 @@ export class ApproveEventModalPage implements OnInit {
       }
     console.log(body);
     this.processes.PostTaskAction(body);
-    this.router.navigate(['/home/gabinete-digital/event-list']);
+    this.ngZone.run(() => {this.router.navigate(['/home/gabinete-digital/event-list'])})
     this.alertService.presentAlert('Operação realizada com sucesso!');
     }
     else{

src/app/pages/gabinete-digital/event-list/event-list.page.ts

@@ -4,7 +4,7 @@ import { EventPerson } from 'src/app/models/eventperson.model';
 import { Event } from 'src/app/models/event.model';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { ModalController, NavParams } from '@ionic/angular';
-import { ApproveEventModalPage } from '../../agenda/approve-event-modal/approve-event-modal.page';
+import { ApproveEventModalPage } from './approve-event-modal/approve-event-modal.page';
 import { NavigationEnd, Router } from '@angular/router';
 
 @Component({