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

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';
@@ -19,7 +20,6 @@ import {
   DAYS_OF_WEEK,
 } from 'angular-calendar';
 import { CustomDateFormatter } from './custom-date-formatter.provider';
-import { ApproveEventModalPage } from './approve-event-modal/approve-event-modal.page';
 import { EventListPage } from '../gabinete-digital/event-list/event-list.page';
 
 @Component({
@@ -182,7 +182,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);
@@ -193,15 +193,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;
@@ -280,12 +280,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);
   }
@@ -293,7 +289,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
@@ -360,11 +356,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({
@@ -426,7 +422,7 @@ export class AgendaPage implements OnInit {
                 });
               });
 
-              this.timelineFilter(this.timelineFilterState);
+              // this.timelineFilter(this.timelineFilterState);
               
               this.myCal.update();
               this.myCal.loadEvents();
@@ -456,7 +452,7 @@ export class AgendaPage implements OnInit {
 
               });
 
-              this.timelineFilter(this.timelineFilterState);
+              // this.timelineFilter(this.timelineFilterState);
 
               this.myCal.update();
               this.myCal.loadEvents();

src/app/pages/agenda/approve-event-modal/approve-event-modal-routing.module.ts

@@ -1,17 +0,0 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-
-import { ApproveEventModalPage } from './approve-event-modal.page';
-
-const routes: Routes = [
-  {
-    path: '',
-    component: ApproveEventModalPage
-  }
-];
-
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule],
-})
-export class ApproveEventModalPageRoutingModule {}

src/app/pages/agenda/approve-event-modal/approve-event-modal.module.ts

@@ -1,20 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
-
-import { IonicModule } from '@ionic/angular';
-
-import { ApproveEventModalPageRoutingModule } from './approve-event-modal-routing.module';
-
-import { ApproveEventModalPage } from './approve-event-modal.page';
-
-@NgModule({
-  imports: [
-    CommonModule,
-    FormsModule,
-    IonicModule,
-    ApproveEventModalPageRoutingModule
-  ],
-  declarations: [ApproveEventModalPage]
-})
-export class ApproveEventModalPageModule {}

src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html

@@ -1,107 +0,0 @@
-<ion-header class="ion-no-border">
-  <div class="header-content">
-    <div class="header-icon-left">
-      <ion-icon (click)="close()" src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
-    </div>
-    <div class="header-title">
-      <label>{{loadedEvent.workflowInstanceDataFields.Subject}}</label>
-    </div>
-    <div class="header-icon-right">
-      <ion-icon (click)="notImplemented()" src="assets/images/icons-edit.svg"></ion-icon>
-    </div>
-  </div>
-</ion-header>
-<ion-menu autoHide="false" side="end" content-id="main-content">
-  <ion-header>
-    <ion-toolbar translucent>
-      <ion-title>Ações</ion-title>
-    </ion-toolbar>
-  </ion-header>
-  <ion-content>
-    <ion-list>
-      <ion-item (click)="approveTask(loadedEvent.serialNumber)">
-        <ion-icon name="checkmark-sharp"></ion-icon>
-        <ion-label>Aprovar</ion-label>
-      </ion-item>
-      <ion-item (click)="emendTask(loadedEvent.serialNumber)">
-        <ion-icon name="create-outline"></ion-icon>
-        <ion-label>Emendar</ion-label>
-      </ion-item>
-      <ion-item (click)="rejectTask(loadedEvent.serialNumber)">
-        <ion-icon name="close-sharp"></ion-icon>
-        <ion-label>Rejeitar</ion-label>
-      </ion-item>
-    </ion-list>
-  </ion-content>
-</ion-menu>
-
-<ion-content id="main-content">
-  <div class="upper-content">
-    <div class="content-location">
-      <div class="location-detail">
-        <ion-label >{{loadedEvent.workflowInstanceDataFields.Location}}</ion-label>
-      </div>
-      <div class="button-calendar-type">
-        <ion-button  class="button-calendar-type" slot="end">{{loadedEvent.workflowInstanceDataFields.Agenda}}</ion-button>
-      </div>
-    </div>
-    <div class="content-details">
-      <ion-label>
-        <p>{{customDate}}</p>
-        <p>das {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'hh:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
-        <p *ngIf="!loadedEvent.workflowInstanceDataFields.IsRecurring">(Não se repete)</p>
-        <p *ngIf="loadedEvent.workflowInstanceDataFields.IsRecurring">Repete</p>
-      </ion-label>
-    </div>
-  </div>
-  <div class="middle-content">
-    <ion-item>
-      <ion-label>
-        <h3>Intervenientes</h3>
-        <p>{{loadedEvent.workflowInstanceDataFields.Participants}}</p>
-      </ion-label>
-    </ion-item>
-    <ion-item>
-      <ion-label>
-        <h3>Detalhes</h3>
-        <p>{{loadedEvent.workflowInstanceDataFields.Body}}</p>
-      </ion-label>
-    </ion-item>
-  </div>
-
-  <div *ngIf="loadedAttachments" class="bottom-content">
-    <ion-list>
-      <h3>Documentos Anexados</h3>
-      <ion-item>
-      <ion-label>
-        <p class="attach-title-item">Receita por Natureza</p>
-        <p><span class="span-left">{{loadedAttachments.Remetente}}</span><span class="span-right">{{loadedAttachments.CreateDate}}<!-- {{ task.CreateDate | date: 'dd-MM-yy' }} --></span></p>
-      </ion-label>
-    </ion-item>
-    </ion-list>
-  </div>
-</ion-content>
-<ion-footer>
-  <ion-toolbar>
-    <div class="buttons">
-    <ion-item lines="none">
-      <p>
-        <ion-button class="button-edit-event" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Emendar</ion-button>
-      </p>
-      <p>
-       <ion-menu-button autoHide="false">
-        <ion-icon  (click)="openMenu()" name="ellipsis-vertical-outline"></ion-icon>
-      </ion-menu-button>
-      </p>
-      <p>
-        <ion-button class="button-approve" shape="round" (click)="approveTask(loadedEvent.serialNumber)">Aprovar</ion-button>
-      </p>
-    </ion-item>
-    <ion-item hidden>
-      <p>
-        <ion-button class="button-reject" shape="round" (click)="rejectTask(loadedEvent.serialNumber)">Rejeitar</ion-button>
-      </p>
-    </ion-item>
-  </div>
-  </ion-toolbar>
-</ion-footer>

src/app/pages/agenda/approve-event-modal/approve-event-modal.page.scss

@@ -1,141 +0,0 @@
-ion-content{
-  --padding-top:0px;
-  --padding-start: 20px;
-  --padding-end: 20px;
-  font-size: 18px;
-}
-ion-menu{
-  --height: 225px;
-}
-.header-content{
-  width: 360px;
-  overflow: auto;
-  margin: 25px auto;
-}
-.header-icon-left{
-  width: 36px;
-  font-size: 33px;
-  color: #42b9fe;
-  float: left;
-}
-.header-title{
-  width: 264px;
-  font-family: Roboto;
-  font-size: 25px;
-  margin: 0 5px 0 5px;
-  padding: 0;
-  color:#000;
-  float: left;
-}
-.header-icon-right{
-  width: 45px;
-  font-size: 45px;
-  float: left;
-  overflow: auto;
-}
-.upper-content{
-  margin-left: 50px;
-  overflow: auto;
-  font-size: 18px;
-
-  .content-location{
-    width: 360px;
-    margin: 0 auto;
-    padding: 0;
-    overflow: auto;
-  }
-
-  .location-detail{
-    width: 210px;
-    font-weight: 700;
-    font-size: 18px;
-    float: left;
-    margin: 5px 5px 5px 0px;
-  }
-  .button-calendar-type{
-      width: 91px;
-      --border-radius: 12.5px;
-      --background: #ffb703;
-      margin-left: 5px;
-      float: left;
-  }
-  .button-calendar-type ion-button{
-    height: 25px;
-  }
-  .button-edit-event {
-      width: 140px;
-      height: 44px;
-      border-radius: 22.5px;
-      --background: #e0e9ee;
-      --color:#061b52;
-  }
-  .content-details p{
-      font-size: 16px;
-  }
-}
-.middle-conten{
-  .middle-content h3, .middle-content p{
-    font-size: 16px;
-  }
-}
-
-.bottom-content{
-  width: 360px;
-  margin: 0 auto;
-  
-  .bottom-content h3{
-    font-size: 16px;
-    margin: 0 0 0 10px;
-  }
-  .attach-document{
-    font-size: 15px;
-    color: #0d89d1;
-    margin: 5px 5px 5px 10px;
-    padding: 5px;
-    float: left;
-  }
-  .attach-icon{
-    width: 37px;
-    font-size: 35px;
-    float: left;
-  }
-  .attach-title-item{
-    width: 100%;
-    font-size: 15px;
-    color:#0d89d1;
-  }
-  /* SPAN */
-  .span-left{
-    float: left;
-    font-size: 15x;
-  }
-  .span-right{
-  text-align: right;
-  float: right;
-  font-size: 13px;
-  }
-}
-
-.buttons{
-  width: 360px;
-  margin: 0 auto;
-}
-
-.button-options {
-    height: 44px;
-     --color: #42b9fe;
-     /* opacity: 0; */
-}
-.button-approve {
-  width: 140px;
-  height: 44px;
-  border-radius: 22.5px;
-  --background: #42b9fe;
-}
-.button-reject {
-  width: 140px;
-  height: 44px;
-  --color: #d30a0a;
-  border-radius: 22.5px;
-  --background: #ffe0e0;
-}

src/app/pages/agenda/approve-event-modal/approve-event-modal.page.spec.ts

@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { IonicModule } from '@ionic/angular';
-
-import { ApproveEventModalPage } from './approve-event-modal.page';
-
-describe('ApproveEventModalPage', () => {
-  let component: ApproveEventModalPage;
-  let fixture: ComponentFixture<ApproveEventModalPage>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ ApproveEventModalPage ],
-      imports: [IonicModule.forRoot()]
-    }).compileComponents();
-
-    fixture = TestBed.createComponent(ApproveEventModalPage);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  }));
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts

@@ -1,141 +0,0 @@
-import { Component, OnInit } 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';
-
-@Component({
-  selector: 'app-approve-event-modal',
-  templateUrl: './approve-event-modal.page.html',
-  styleUrls: ['./approve-event-modal.page.scss'],
-})
-export class ApproveEventModalPage implements OnInit {
-  event: Event;
-  loadedEvent:any;
-  loadedAttachments:any;
-  serialNumber:string;
-  customDate:any;
-  today:any;
-  
-  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"];
-
-  
-  constructor(
-    private router:Router,
-    private modalController: ModalController,
-    private navParams: NavParams,
-    private processes:ProcessesService,
-    private attachmentsService: AttachmentsService,
-    private popoverController: PopoverController,
-    private menu: MenuController,
-    private alertService: AlertService,
-    )
-    {
-      this.serialNumber = this.navParams.get('serialNumber');
-     }
-
-  ngOnInit() {
-    this.getTask();
-    this.getAttachments();
-  }
-
-  notImplemented(){
-    this.alertService.presentAlert('Funcionalidade em desenvolvimento');
-  }
-
-  close(){
-    /* this.router.navigate(['/home/gabinete-digital/event-list']); */
-    this.modalController.dismiss(null);
-  }
-
-  getTask(){
-    this.processes.GetTask(this.serialNumber).subscribe(res => {
-      console.log(res);
-      this.loadedEvent = res;
-      this.today = new Date(res.workflowInstanceDataFields.StartDate);
-      console.log(new Date(this.today));
-      this.customDate = this.days[this.today.getDay()]+ ", "  + this.today.getDate() +" de "  + ( this.months[this.today.getMonth()]);
-      
-    })
-  }
-  approveTask(serialNumber:string){
-    let body = { "serialNumber": serialNumber, "action": "Aprovar" }
-    console.log(body);
-    this.processes.PostTaskAction(body);
-    this.alertService.presentAlert('Operação realizada com sucesso!');
-    this.router.navigate(['/home/gabinete-digital/event-list']);
-    this.modalController.dismiss(null);
-  }
-
-  emendTask(serialNumber:string){
-    /* console.log('Emendar'); */
-    this.menu.close();
-    this.openEmendMessageModal(serialNumber);
-    this.modalController.dismiss(null);
-  }
-
-  rejectTask(serialNumber:string){
-  
-    let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
-    console.log(body);
-    this.processes.PostTaskAction(body);
-    this.alertService.presentAlert('Operação realizada com sucesso!');
-    this.router.navigate(['/home/gabinete-digital/event-list']);
-    this.modalController.dismiss(null);
-  }
-  getAttachments(){
-    this.attachmentsService.getAttachmentsBySerial(this.serialNumber).subscribe(res=>{
-      this.loadedAttachments = res;
-      console.log(res);
-    });
-  }
-
-  async openOptions(ev:any) {
-    const popover = await this.popoverController.create({
-      component: EventActionsPopoverPage,
-      cssClass: 'event-actions-popover',
-      event: ev,
-      translucent: true
-    });
-    return await popover.present();
-  }
-  openMenu() {
-    this.menu.open();
- }
- async openEmendMessageModal(serialNumber:string) {
-  const modal = await this.modalController.create({
-    component: EmendMessageModalPage,
-    componentProps:{
-      
-    },
-    cssClass: 'emend-message-modal',
-    backdropDismiss: false
-  });
-
-  await modal.present();
-
-  modal.onDidDismiss().then(res => {
-    if(res.data !== ''){
-      let body = { "serialNumber": serialNumber, 
-       "action": "Emendar",
-       "dataFields": {
-       "ReviewerComments": res.data,
-       }
-      }
-    console.log(body);
-    this.processes.PostTaskAction(body);
-    this.router.navigate(['/home/gabinete-digital/event-list']);
-    this.alertService.presentAlert('Operação realizada com sucesso!');
-    }
-    else{
-      this.alertService.presentAlert('Operação cancelada!');
-    }
-  });
-}
-  
-}

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

@@ -1,12 +1,13 @@
 import { Component, OnInit } from '@angular/core';
-import { Router } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
 import { Event } from 'src/app/models/event.model';
-import { EmendMessageModalPage } from 'src/app/pages/agenda/emend-message-modal/emend-message-modal.page';
-import { EventActionsPopoverPage } from 'src/app/pages/agenda/event-actions-popover/event-actions-popover.page';
 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 '../../../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',
@@ -15,36 +16,45 @@ import { ProcessesService } from 'src/app/services/processes.service';
 })
 export class ApproveEventModalPage implements OnInit {
   event: Event;
-  loadedEvent:any;
-  loadedAttachments:any;
-  serialNumber:string;
-  customDate:any;
-  today:any;
-  
+  loadedEvent: any;
+  loadedAttachments: any;
+  serialNumber: string;
+  customDate: any;
+  today: any;
+
   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"];
 
-  
+
   constructor(
-    private router:Router,
+    private router: Router,
     private modalController: ModalController,
     private navParams: NavParams,
-    private processes:ProcessesService,
+    private processes: ProcessesService,
     private attachmentsService: AttachmentsService,
     private popoverController: PopoverController,
     private menu: MenuController,
     private alertService: AlertService,
-    )
-    {
-      this.serialNumber = this.navParams.get('serialNumber');
-     }
+    private activatedRoute: ActivatedRoute,
+  ) {
+    this.activatedRoute.paramMap.subscribe(paramMap =>
+      {
+        if (!paramMap.has("serialNumber")){
+          return;
+        }
+        else{
+          this.serialNumber = paramMap.get('serialNumber'); 
+        }
+      });
+  }
 
   ngOnInit() {
     this.getTask();
     this.getAttachments();
   }
 
-  notImplemented(){
+
+  notImplemented() {
     this.alertService.presentAlert('Funcionalidade em desenvolvimento');
   }
 
@@ -55,7 +65,7 @@ export class ApproveEventModalPage implements OnInit {
 
   getTask(){
     this.processes.GetTask(this.serialNumber).subscribe(res => {
-      console.log(res);
+      console.log('GET TASK SERIALNUMBER: ', this.serialNumber,'Approve event',res);
       this.loadedEvent = res;
       this.today = new Date(res.workflowInstanceDataFields.StartDate);
       console.log(new Date(this.today));
@@ -64,6 +74,7 @@ export class ApproveEventModalPage implements OnInit {
     })
   }
   approveTask(serialNumber:string){
+    console.log('approveTask SERIALNUMBER: ', serialNumber)
     let body = { "serialNumber": serialNumber, "action": "Aprovar" }
     console.log(body);
     this.processes.PostTaskAction(body);
@@ -73,6 +84,7 @@ export class ApproveEventModalPage implements OnInit {
   }
 
   emendTask(serialNumber:string){
+    console.log('emendTask: ',serialNumber)
     /* console.log('Emendar'); */
     this.menu.close();
     this.openEmendMessageModal(serialNumber);
@@ -80,7 +92,7 @@ export class ApproveEventModalPage implements OnInit {
   }
 
   rejectTask(serialNumber:string){
-  
+    console.log('rejectTask: ',serialNumber)
     let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
     console.log(body);
     this.processes.PostTaskAction(body);
@@ -90,6 +102,7 @@ export class ApproveEventModalPage implements OnInit {
   }
   getAttachments(){
     this.attachmentsService.getAttachmentsBySerial(this.serialNumber).subscribe(res=>{
+      console.log('getAttachments: ',this.serialNumber)
       this.loadedAttachments = res;
       console.log(res);
     });

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

@@ -40,6 +40,7 @@
           <ion-item-sliding>
             <ion-item class="Rectangle" lines="none" 
               *ngFor="let event of eventsMDGPRList" (click)="openApproveModal(event.serialNumber)">
+              
               <div class="content-mdgpr-{{event.workflowInstanceDataFields.Agenda}}">
                 <div class="approve-event-time">
                   <p>{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}</p>

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({

src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts

@@ -22,18 +22,18 @@ import { momentG }  from 'src/plugin/momentG'
 export class ExpedienteDetailPage implements OnInit {
 
   task: any;
-  fulltask:any;
-  eventsList: Event[];  
-  serialnumber:string;
+  fulltask: any;
+  eventsList: Event[];
+  serialnumber: string;
   profile: string;
 
   constructor(private activateRoute: ActivatedRoute,
-    private processes:ProcessesService,
+    private processes: ProcessesService,
     private iab: InAppBrowser,
     private attachments: AttachmentsService,
     private events: EventsService,
     private menu: MenuController,
-    private router:Router,
+    private router: Router,
     private modalController: ModalController,
     private navParams: NavParams,
     private alertService: AlertService) { 
@@ -46,7 +46,7 @@ export class ExpedienteDetailPage implements OnInit {
     console.log(this.serialnumber);
     
     this.activateRoute.paramMap.subscribe(paramMap => {
-      if (!paramMap.has('SerialNumber')){
+      if (!paramMap.has('SerialNumber')) {
         return;
       }
       /* this.serialnumber = paramMap.get('SerialNumber'); */
@@ -58,8 +58,7 @@ export class ExpedienteDetailPage implements OnInit {
   }
 
 
-  async LoadTaskDetail(serial:string)
-  {
+  async LoadTaskDetail(serial: string) {
     this.processes.GetTask(serial).subscribe(res => {
       this.task = {
         "SerialNumber": res.serialNumber,
@@ -71,18 +70,16 @@ export class ExpedienteDetailPage implements OnInit {
       }
       this.fulltask = res;
       console.log(res);
-      
+
     });
   }
 
-  async LoadRelatedEvents(serial:string)
-  {
-    if (this.eventsList == null)
-    {
+  async LoadRelatedEvents(serial: string) {
+    if (this.eventsList == null) {
       this.attachments.getAttachmentsBySerial(serial).subscribe(res => {
         console.log(res);
-        res.forEach(att =>{
-          if (this.eventsList == null){
+        res.forEach(att => {
+          if (this.eventsList == null) {
             this.eventsList = new Array();
           }
           this.events.getEvent(att.ParentId).subscribe(event => {
@@ -101,13 +98,13 @@ export class ExpedienteDetailPage implements OnInit {
   }
 
   openMenu() {
-     this.menu.open();
+    this.menu.open();
   }
 
-  async openExpedientActionsModal(taskAction:any, task:any){
+  async openExpedientActionsModal(taskAction: any, task: any) {
     const modal = await this.modalController.create({
       component: ExpedientTaskModalPage,
-      componentProps:{
+      componentProps: {
         taskAction: taskAction,
         task: task,
       },
@@ -118,17 +115,17 @@ export class ExpedienteDetailPage implements OnInit {
     modal.onDidDismiss();
   }
 
-  discartExpedient(){
+  discartExpedient() {
     let body = { "serialNumber": this.serialnumber, "action": "Task Completed" }
     console.log(body);
     this.processes.PostTaskAction(body);
     this.router.navigate(['/home/gabinete-digital/expediente']);
   }
 
-  async openBookMeetingModal(task:any){
+  async openBookMeetingModal(task: any) {
     const modal = await this.modalController.create({
       component: BookMeetingModalPage,
-      componentProps:{
+      componentProps: {
         task: task,
       },
       cssClass: 'book-meeting-modal',
@@ -138,12 +135,12 @@ export class ExpedienteDetailPage implements OnInit {
     modal.onDidDismiss();
   }
 
-  async viewEventDetail(eventId:any) {
+  async viewEventDetail(eventId: any) {
     console.log(this.profile);
-    
+
     const modal = await this.modalController.create({
       component: ViewEventPage,
-      componentProps:{
+      componentProps: {
         eventId: eventId,
         profile: this.profile,
       },
@@ -151,8 +148,8 @@ export class ExpedienteDetailPage implements OnInit {
       backdropDismiss: false
     });
     await modal.present();
-    modal.onDidDismiss().then((res)=>{
-      if(res){
+    modal.onDidDismiss().then((res) => {
+      if (res) {
       }
     });
   }

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

@@ -98,12 +98,14 @@ export class LoginPage implements OnInit {
           this.storageService.get(AuthConnstants.USER).then(res => {
             console.log('USERID', res);
             const headers = { 'Authorization': 'Basic cGF1bG8ucGludG9AZ2FiaW5ldGVkaWdpdGFsLmxvY2FsOnRhYnRlc3RlQDAwNg==' };
-            const body = { UserId: res,
+            const body = {
+              UserId: res,
               TokenId: token.value,
               Status: 1,
-              Service: 1 };
+              Service: 1
+            };
 
-            this.http.post<Token>('https://equilibrium.dyndns.info/GabineteDigital.Services/V4/api/notifications/token', body,{headers}).subscribe(data => {
+            this.http.post<Token>('https://equilibrium.dyndns.info/GabineteDigital.Services/V4/api/notifications/token', body, { headers }).subscribe(data => {
               console.log('TOKEN USER MIDLE', data);
             })
         });