Merge with developer brunch

src/app/app.component.spec.ts

@@ -2,8 +2,8 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { TestBed, async } from '@angular/core/testing';
 
 import { Platform } from '@ionic/angular';
-import { SplashScreen } from '@ionic-native/splash-screen/ngx';
-import { StatusBar } from '@ionic-native/status-bar/ngx';
+/* import { SplashScreen } from '@ionic-native/splash-screen/ngx';
+import { StatusBar } from '@ionic-native/status-bar/ngx'; */
 
 import { AppComponent } from './app.component';
 
@@ -21,8 +21,8 @@ describe('AppComponent', () => {
       declarations: [AppComponent],
       schemas: [CUSTOM_ELEMENTS_SCHEMA],
       providers: [
-        { provide: StatusBar, useValue: statusBarSpy },
-        { provide: SplashScreen, useValue: splashScreenSpy },
+        {/*  provide: StatusBar, useValue: statusBarSpy */ },
+        {/*  provide: SplashScreen, useValue: splashScreenSpy */ },
         { provide: Platform, useValue: platformSpy },
       ],
     }).compileComponents();

src/app/app.component.ts

@@ -1,9 +1,9 @@
 import { Component } from '@angular/core';
 
 import { Platform } from '@ionic/angular';
-import { SplashScreen } from '@ionic-native/splash-screen/ngx';
+/* import { SplashScreen } from '@ionic-native/splash-screen/ngx';
 import { StatusBar } from '@ionic-native/status-bar/ngx';
-
+ */
 @Component({
   selector: 'app-root',
   templateUrl: 'app.component.html',
@@ -12,16 +12,16 @@ import { StatusBar } from '@ionic-native/status-bar/ngx';
 export class AppComponent {
   constructor(
     private platform: Platform,
-    private splashScreen: SplashScreen,
-    private statusBar: StatusBar
+   /*  private splashScreen: SplashScreen,
+    private statusBar: StatusBar */
   ) {
     this.initializeApp();
   }
 
   initializeApp() {
     this.platform.ready().then(() => {
-      this.statusBar.styleDefault();
-      this.splashScreen.hide();
+      /* this.statusBar.styleDefault();
+      this.splashScreen.hide(); */
     });
   }
 }

src/app/app.module.ts

@@ -3,8 +3,8 @@ import { BrowserModule } from '@angular/platform-browser';
 import { RouteReuseStrategy } from '@angular/router';
 
 import { IonicModule, IonicRouteStrategy } from '@ionic/angular';
-import { SplashScreen } from '@ionic-native/splash-screen/ngx';
-import { StatusBar } from '@ionic-native/status-bar/ngx';
+/* import { SplashScreen } from '@ionic-native/splash-screen/ngx';
+import { StatusBar } from '@ionic-native/status-bar/ngx'; */
 
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
@@ -13,10 +13,10 @@ import { HttpClientModule } from '@angular/common/http';
 import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
 
 
-//import { File } from '@ionic-native/File/ngx';
+import { File } from '@ionic-native/File/ngx';
 import { WebView } from '@ionic-native/ionic-webview/ngx';
 import { FilePath } from '@ionic-native/file-path/ngx';
-/* import { Camera } from '@ionic-native/camera/ngx'; */
+import { Camera } from '@ionic-native/camera/ngx';
 import { IonicStorageModule } from '@ionic/storage';
 import { PipesModule } from './pipes/pipes.module';
 //
@@ -47,13 +47,13 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
     HttpClientModule, 
     ],
   providers: [
-    StatusBar,
-    SplashScreen,
+    /* StatusBar,
+    SplashScreen, */
     HttpClientModule,
     { provide: RouteReuseStrategy, useClass: IonicRouteStrategy },
     InAppBrowser,
-    /* Camera, */
-    //File,
+    Camera,
+    File,
     WebView,
     FilePath,
   ],

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

@@ -54,8 +54,8 @@
             </thead>
           </table>
 
-
-          <calendar class="calendar-component"
+          <calendar  
+            class="calendar-component"
             [eventSource]="eventSource"
             [calendarMode]="calendar.mode"
             [currentDate]="calendar.currentDate"
@@ -118,7 +118,8 @@
             </thead>
           </table>
 
-          <calendar class="calendar-component"
+          <calendar 
+            class="calendar-component"
             [eventSource]="eventSource"
             [calendarMode]="calendar.mode"
             [currentDate]="calendar.currentDate"
@@ -183,7 +184,8 @@
             </thead>
           </table>
           
-          <calendar class="calendar-component"
+          <calendar 
+            class="calendar-component"
             [eventSource]="eventSource"
             [calendarMode]="calendar.mode"
             [currentDate]="calendar.currentDate"
@@ -217,7 +219,11 @@
 
       <!-- Calendar currente date -->
       <ion-row class="ion-justify-content-between ion-align-items-center currente-date-timelien">
-        <ion-row class="timeline-date">
+        
+        <ion-row class="timeline-date align-center">
+           <!-- <ion-icon *ngIf="showCalendar" (click)="showCalendar=false" class="collaps" src="assets/images/icons-add-new-event.svg" >1</ion-icon>
+          <ion-icon *ngIf="!showCalendar" (click)="showCalendar=true" class="collaps" src="assets/images/icons-add-new-event.svg" >2</ion-icon>  -->
+          
           <span *ngIf="timelineIsCurrentDate()">Hoje, &nbsp;</span> {{ timelineDate }}
         </ion-row>
         <ion-row class="filter ion-align-items-center">

src/app/pages/agenda/agenda.page.scss

@@ -36,7 +36,6 @@ ion-slide{
   .item{
     /* background: red !important; */
     text-transform: capitalize;
-
   }
   .input-wrapper{
     border-left: red !important;
@@ -416,6 +415,10 @@ td.monthview-primary-with-event {
     font-size: 15px;
     font-weight: bold;
   }
+  .collaps{
+    font-size: 28px;
+    padding-right: 8px;
+  }
   .filter{
     font-size: 15px;
     font-weight: normal;
@@ -454,3 +457,7 @@ td.monthview-primary-with-event {
   }
 }
 
+
+.showcalendar{
+  display: none;
+}

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

@@ -9,6 +9,7 @@ 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';
@@ -50,6 +51,10 @@ export class AgendaPage implements OnInit {
     this.view = view;
   }
 
+  // calendar
+  showCalendar: boolean;
+
+  // timeline
   monthList = [
     { name: 'Janeiro', id: 'Jan' },
     { name: 'Fevereiro', id: 'Feb' },
@@ -65,13 +70,12 @@ export class AgendaPage implements OnInit {
     { name: 'Dezembro', id: 'Dec' }
   ]
 
-  showTimeline: boolean= false;
-  
   // for timeline
   events: CalendarEvent[] = [];
   // timeline filter
   timelineFilterState: string = 'Todos';
-  showTimelineFilterState: boolean= false;
+  showTimelineFilterState: boolean;
+  showTimeline: boolean;
   
   /* List of events of our calendar */
   eventSource = [];
@@ -118,11 +122,8 @@ export class AgendaPage implements OnInit {
     private alertCrontroller: AlertService
     ) {
 
-      // timeline inicial date
-      this.timelineDate = new Date().toLocaleString();
-      
-      //this.timelineDate = formatDate(new Date,'dd MMMM yyyy', 'pt');
-
+      this.showCalendar = true;
+      this.timelineDate = momentG(new Date(),'dd MMMM yyyy');
 
       function setCookie(cname, cvalue, exdays) {
         var d = new Date();
@@ -135,6 +136,8 @@ export class AgendaPage implements OnInit {
       setCookie('searchModalAPPType','0', 99999999);
 
       this.showLoader = false;
+      this.showTimelineFilterState = false;
+      this.showTimeline = false;
 
     }
 
@@ -155,8 +158,6 @@ export class AgendaPage implements OnInit {
         }
       }
     });
-
-
   }
 
   //Go to the next view of the calendar month/week/day
@@ -250,7 +251,6 @@ export class AgendaPage implements OnInit {
     });
   }
 
-
   // for calendar
   currentDayEventDisplayBorder(day: any, id: any){
 
@@ -412,9 +412,9 @@ export class AgendaPage implements OnInit {
         //Inicializa o array eventSource
         this.eventSource=[];
         
-        
+
         if(this.profile == "mdgpr"){
-           this.eventService.getAllMdEvents(new Date(startTime).toLocaleString(), new Date(endTime).toLocaleString()).subscribe(
+           this.eventService.getAllMdEvents( momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59') ).subscribe(
             response => {
               this.eventsList = response;
               // loop
@@ -445,7 +445,7 @@ export class AgendaPage implements OnInit {
     
         }
         else{
-          this.eventService.getAllPrEvents(new Date(startTime).toLocaleString(), new Date(endTime).toLocaleString()).subscribe(
+          this.eventService.getAllPrEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe(
             response => {
               this.eventsList = response;
               this.eventsList.forEach((element, eventIndex) => {
@@ -478,7 +478,7 @@ export class AgendaPage implements OnInit {
         //Inicializa o array eventSource
         this.eventSource=[];
         if(this.profile == "mdgpr"){
-          this.eventService.getAllMdEvents(new Date(startTime).toLocaleString(), new Date(endTime).toLocaleString()).subscribe(response => {
+          this.eventService.getAllMdEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe(response => {
               this.eventsListPessoal = response.filter(data => data.CalendarName == "Pessoal");
               this.eventsListPessoal.forEach(element => {
                 this.eventSource.push({
@@ -495,7 +495,7 @@ export class AgendaPage implements OnInit {
             });
         }
         else{
-          this.eventService.getAllPrEvents(new Date(startTime).toLocaleString(), new Date(endTime).toLocaleString()).subscribe(response => {
+          this.eventService.getAllPrEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe(response => {
             this.eventsListPessoal = response.filter(data => data.CalendarName == "Pessoal");
             this.eventsListPessoal.forEach(element => {
               this.eventSource.push({
@@ -517,7 +517,7 @@ export class AgendaPage implements OnInit {
         //Inicializa o array eventSource
         this.eventSource=[];
         if(this.profile == "mdgpr"){
-          this.eventService.getAllMdEvents(new Date(startTime).toLocaleString(), new Date(endTime).toLocaleString()).subscribe(res => {
+          this.eventService.getAllMdEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe(res => {
               this.eventsListOficial = res.filter(data => data.CalendarName == "Oficial");
               this.eventsListOficial.forEach(element => {
                 this.eventSource.push({
@@ -533,7 +533,7 @@ export class AgendaPage implements OnInit {
               this.showLoader = false;
             });
         }else{
-          this.eventService.getAllPrEvents(new Date(startTime).toLocaleString(), new Date(endTime).toLocaleString()).subscribe(res => {
+          this.eventService.getAllPrEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe(res => {
             this.eventsListOficial = res.filter(data => data.CalendarName == "Oficial");
             this.eventsListOficial.forEach(element => {
               this.eventSource.push({

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

@@ -31,7 +31,7 @@
       <div class="content-details">
         <ion-label>
           <p>{{customDate}}</p>
-          <p>das {{loadedEvent.StartDate | date: 'hh:mm'}} às {{loadedEvent.EndDate | date: 'hh:mm'}}</p>
+          <p>das {{loadedEvent.StartDate | date: 'HH:mm'}} às {{loadedEvent.EndDate | date: 'HH:mm'}}</p>
           <p *ngIf="!loadedEvent.IsRecurring">(Não se repete)</p>
           <p *ngIf="loadedEvent.IsRecurring">Repete</p>
         </ion-label>

src/app/pages/events/events.page.html

@@ -20,7 +20,7 @@
     </ion-label>
 
     <div class="next-meeting">
-      <div class="meeting-time">{{hoursMinutes}}</div>
+      <div class="meeting-time">{{currentHoursMinutes | date: 'HH:mm'}}</div>
       <div class="meeting-description"> "{{currentEvent}}"</div>
     </div>
 
@@ -40,8 +40,8 @@
             (click)="viewEventDetail(event.EventId)">
             <div class="d-flex  content-{{profile}}-{{event.CalendarName}}">
               <div class="schedule-time">
-                <div class="time-start">{{event.StartDate | date: 'hh:mm'}}</div>
-                <div class="time-end">{{event.EndDate | date: 'hh:mm'}}</div>
+                <div class="time-start">{{event.StartDate | date: 'HH:mm'}}</div>
+                <div class="time-end">{{event.EndDate | date: 'HH:mm'}}</div>
               </div>
               <div class="schedule-details">
                 <div class="location">{{event.Location}}</div>
@@ -76,12 +76,12 @@
           <ul>
             <li *ngFor = "let task of taskslist"
             (click)="viewExpedientDetail(task.SerialNumber)">
-           <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
+            <!-- [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
             >
             <div class="d-flex">
               <div class="schedule-date">
                 <div class="time-end">{{task.CreateDate | date: 'd/M/yy'}}</div>
-                <div class="time-start">{{task.CreateDate | date: 'hh:mm'}}</div>
+                <div class="time-start">{{task.CreateDate | date: 'HH:mm'}}</div>
               </div>
               <div class="schedule-details pointer">
                 <div class="description">{{ task.Folio }}</div>

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

@@ -53,7 +53,7 @@ export class EventsPage implements OnInit {
 
   customText = false;
   totalEvent=0;
-  currentHoursMinutes: String;
+  currentHoursMinutes: Date;
 
   showLoader: boolean;
   
@@ -68,11 +68,6 @@ export class EventsPage implements OnInit {
     private authService: AuthService,
     private processes:ProcessesService) {
       this.prEventList = null;
-      
-      // update hours and minutes
-      setInterval(()=> {
-        this.currentHoursMinutes = formatDate(new Date(), 'HH:MM', 'pt');
-      }, 1000);
 
       // list
       this.LoadList();
@@ -91,22 +86,6 @@ export class EventsPage implements OnInit {
     this.profile = "mdgpr";
     console.log(this.profile);
 
-    // set event list
-    /* 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 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.storageService.get(AuthConnstants.USER).then(res=>{
       console.log(res);
     });
@@ -137,27 +116,38 @@ export class EventsPage implements OnInit {
   RefreshEvents(){
     this.showLoader = true;
 
+    let date = new Date();
+    date.setMonth(date.getMonth() + 1);
+    let start = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
+    let end = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" 23:59:59";
+
     switch (this.segment)
     {
       case "Combinada":
         if(this.profile == "mdgpr"){
-          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.eventService.getAllMdEvents(start, end).subscribe(res => {
             this.eventsList = res;
             
             if(res.length > 0){
               this.currentEvent = res[0].Subject;
+              this.currentHoursMinutes = res[0].StartDate;
             }
             
             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.eventService.getAllPrEvents(start, end).subscribe(res => {
               this.eventsList = res;
               console.log(this.eventsList);
-              console.log(res)
-              console.log(res[0])
-              this.currentEvent = res[0].Subject;
+              console.log(res);
+              console.log(res[0]);
+
+              if(res.length > 0){
+                this.currentEvent = res[0].Subject;
+                this.currentHoursMinutes = res[0].StartDate;
+              }
+
               this.totalEvent = this.eventsList.length;
               this.showLoader = false;
           });
@@ -166,12 +156,12 @@ export class EventsPage implements OnInit {
         break;
       case "Pessoal":
         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(start, end).subscribe(res => {
           this.personaleventsList = res.filter(data => data.CalendarName == "Pessoal");
           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.eventService.getAllPrEvents(start, end).subscribe(res => {
             this.personaleventsList = res.filter(data => data.CalendarName == "Pessoal");
             this.showLoader = false;
            });
@@ -180,12 +170,12 @@ export class EventsPage implements OnInit {
         break;
       case "Oficial":
         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(start, end).subscribe(res => {
             this.officialeventsList = res.filter(data => data.CalendarName == "Oficial");;
             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.eventService.getAllPrEvents(start, end).subscribe(res => {
             this.officialeventsList = res.filter(data => data.CalendarName == "Oficial");;
             this.showLoader = false;
            });
@@ -255,16 +245,6 @@ export class EventsPage implements OnInit {
     return await modal.present();
   }
 
-
-  /**
-   * @returns time in format HH:MM
-   */
-  get hoursMinutes():String {
-  
-    return  this.currentHoursMinutes;
-
-  }
-
   LoadList()
   {
     this.processes.GetTasksList("Expediente", false).subscribe(result => {

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

@@ -53,26 +53,27 @@ export class ApproveEventModalPage implements OnInit {
     this.getAttachments();
   }
 
+
   notImplemented() {
     this.alertService.presentAlert('Funcionalidade em desenvolvimento');
   }
 
-  close() {
-    this.router.navigate(['/home/gabinete-digital/event-list']);
+  close(){
+    /* this.router.navigate(['/home/gabinete-digital/event-list']); */
     this.modalController.dismiss(null);
   }
 
-  getTask() {
+  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()]);
-
+      this.customDate = this.days[this.today.getDay()]+ ", "  + this.today.getDate() +" de "  + ( this.months[this.today.getMonth()]);
+      
     })
   }
-  approveTask(serialNumber: string) {
+  approveTask(serialNumber:string){
     let body = { "serialNumber": serialNumber, "action": "Aprovar" }
     console.log(body);
     this.processes.PostTaskAction(body);
@@ -81,30 +82,30 @@ export class ApproveEventModalPage implements OnInit {
     this.modalController.dismiss(null);
   }
 
-  emendTask(serialNumber: string) {
+  emendTask(serialNumber:string){
     /* console.log('Emendar'); */
     this.menu.close();
     this.openEmendMessageModal(serialNumber);
     this.modalController.dismiss(null);
   }
 
-  rejectTask(serialNumber: string) {
-
+  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.router.navigate(['/home/gabinete-digital/event-list']);
     this.modalController.dismiss(null);
   }
-  getAttachments() {
-    this.attachmentsService.getAttachmentsBySerial(this.serialNumber).subscribe(res => {
+  getAttachments(){
+    this.attachmentsService.getAttachmentsBySerial(this.serialNumber).subscribe(res=>{
       this.loadedAttachments = res;
       console.log(res);
     });
   }
 
-  async openOptions(ev: any) {
+  async openOptions(ev:any) {
     const popover = await this.popoverController.create({
       component: EventActionsPopoverPage,
       cssClass: 'event-actions-popover',
@@ -115,37 +116,36 @@ export class ApproveEventModalPage implements OnInit {
   }
   openMenu() {
     this.menu.open();
-  }
-  async openEmendMessageModal(serialNumber: string) {
-    const modal = await this.modalController.create({
-      component: EmendMessageModalPage,
-      componentProps: {
+ }
+ async openEmendMessageModal(serialNumber:string) {
+  const modal = await this.modalController.create({
+    component: EmendMessageModalPage,
+    componentProps:{
+      
+    },
+    cssClass: 'emend-message-modal',
+    backdropDismiss: false
+  });
 
-      },
-      cssClass: 'emend-message-modal',
-      backdropDismiss: false
-    });
+  await modal.present();
 
-    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!');
+  modal.onDidDismiss().then(res => {
+    if(res.data !== ''){
+      let body = { "serialNumber": serialNumber, 
+       "action": "Emendar",
+       "dataFields": {
+       "ReviewerComments": res.data,
+       }
       }
-      else {
-        this.alertService.presentAlert('Operação cancelada!');
-      }
-    });
-  }
-
+    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/login/login.page.ts

@@ -62,11 +62,11 @@ export class LoginPage implements OnInit {
     await alert.present();
   }
 
-  loginRocketChat(user: any) {
+  loginRocketChat() {
 
     let postData = {
-      "user": user.username,
-      "password": user.password,
+      "user": this.username,
+      "password": this.password,
     }
     this.authService.loginChat(postData).subscribe((res: any) => {
       console.log(res.data);
@@ -130,8 +130,8 @@ export class LoginPage implements OnInit {
         BasicAuthKey: ""
       }
       if (await this.authService.login(this.userattempt)) {
-        /* this.loginRocketChat(); */
-        this.storeUserIdANdToken()
+        this.loginRocketChat();
+        this.storeUserIdANdToken();
 
         this.router.navigate(['/home/events']);
       }

src/app/pages/publications/new-publication/new-publication.page.ts

@@ -14,7 +14,7 @@ import { AlertService } from 'src/app/services/alert.service';
 /* const { Camera } = Plugins; */
 
 //Cordova
-/* import { Camera, CameraOptions } from '@ionic-native/camera/ngx'; */
+import { Camera, CameraOptions } from '@ionic-native/camera/ngx';
 import { PublicationFolder } from 'src/app/models/publicationfolder';
 import { ViewPublicationsPage } from '../view-publications/view-publications.page';
 import { LoadingService } from 'src/app/services/loading.service';
@@ -51,7 +51,7 @@ export class NewPublicationPage implements OnInit {
     public photoService: PhotoService,
     private navParams: NavParams,
     private publications: PublicationsService,
-    /* private camera: Camera, */
+    private camera: Camera,
     ) {
      
       this.publicationType = this.navParams.get('publicationType');
@@ -65,7 +65,7 @@ export class NewPublicationPage implements OnInit {
     this.takePicture();
   }
   takePicture(){
-    /* const options: CameraOptions = {
+    const options: CameraOptions = {
       quality: 100,
       destinationType: this.camera.DestinationType.DATA_URL,
       encodingType: this.camera.EncodingType.JPEG,
@@ -82,7 +82,7 @@ export class NewPublicationPage implements OnInit {
      this.capturedImageTitle = new Date().getTime() + '.jpeg';
     }, (err) => {
      console.log(err);
-    }); */
+    });
   }
 
   getPicture(){