Improve task options

src/app/shared/popover/opts-expediente-pr/opts-expediente-pr-routing.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { OptsExpedientePrPage } from './opts-expediente-pr.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: OptsExpedientePrPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class OptsExpedientePrPageRoutingModule {}

src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { OptsExpedientePrPageRoutingModule } from './opts-expediente-pr-routing.module';
+
+import { OptsExpedientePrPage } from './opts-expediente-pr.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    OptsExpedientePrPageRoutingModule
+  ],
+  declarations: [OptsExpedientePrPage]
+})
+export class OptsExpedientePrPageModule {}

src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.html

@@ -0,0 +1,30 @@
+<ion-content class="container">
+
+  <div class="arrow-right" (click)="close()">
+    <button class="btn-no-color">
+      <ion-icon slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
+    </button>
+  </div>
+
+  <div *ngIf="task">
+    <div *ngIf="loggeduser.Profile =='MDGPR' " class="buttons">
+      <button (click)="openAddNoteModal('Aprovar')" class="btn-cancel" shape="round" >Aprovar</button>
+      <button (click)="openAddNoteModal('Revisão')" class="btn-cancel" shape="round" >Mandar para Revisão</button>
+      <div class="solid"></div>
+      <button (click)="distartExpedientModal(fulltask)" class="btn-cancel" shape="round" >Descartar</button>
+      <div hidden class="solid"></div>
+      <button hidden class="btn-cancel" shape="round" >Delegar</button>
+    </div>
+    <div *ngIf="loggeduser.Profile =='PR' " class="buttons">
+      <button (click)="openExpedientActionsModal('0', fulltask)" class="btn-ok" shape="round" >Marcar para Despacho</button>
+      <button (click)="distartExpedientModal(fulltask)" class="btn-cancel" shape="round" >Descartar</button>
+      <div class="solid"></div>
+      <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
+      <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+      <button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+      <div hidden class="solid"></div>
+      <button hidden class="btn-cancel" shape="round" >Delegar</button>
+    </div>
+  </div>
+
+</ion-content>

src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.scss

@@ -0,0 +1,56 @@
+.container{
+    --padding-top:20px !important;
+   --padding-bottom:20px !important;
+   --padding-start:20px !important;
+   --padding-end:20px !important;
+}
+.arrow-right{
+    display: none;
+    margin-bottom: 20px;
+    .arrow-right-icon{
+        width: 37px;
+        float: right;
+        font-size: 35px;
+        overflow: hidden;
+    }
+}
+.buttons{
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-around;
+}
+.solid {
+    display: none;
+    width: 90%;
+    border-top: 1px solid #bbb;
+    margin: 0 auto !important;
+  }
+  .btn-ok, .btn-cancel{
+    //width: 50% !important;
+    margin-bottom: 5px !important;
+    margin-top: 5px !important;
+}
+@media only screen and (max-width: 800px) {
+    .btn-ok, .btn-cancel, .btn-delete{
+        width: 47% !important;
+    }
+}
+@media only screen and (min-width: 1024px) {
+    .arrow-right{
+        display: flex;
+        justify-content: flex-end;
+    }
+    .btn-cancel{
+        display: none;
+        width: 100% !important;
+        margin-bottom: 10px !important;
+    }
+    .btn-delete, .btn-ok{
+        width: 100% !important;
+        margin-bottom: 10px !important;
+        margin-top: 10px !important;
+    }
+   /*  .solid{
+        display: block;
+    } */
+}

src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.spec.ts

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

src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts

@@ -0,0 +1,306 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
+import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
+import { User } from 'src/app/models/user.model';
+import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
+import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
+import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
+import { AlertService } from 'src/app/services/alert.service';
+import { AttachmentsService } from 'src/app/services/attachments.service';
+import { AuthService } from 'src/app/services/auth.service';
+import { EventsService } from 'src/app/services/events.service';
+import { ProcessesService } from 'src/app/services/processes.service';
+import { BadRequestComponent } from '../bad-request/bad-request.component';
+import { SuccessMessageComponent } from '../success-message/success-message.component';
+
+@Component({
+  selector: 'app-opts-expediente-pr',
+  templateUrl: './opts-expediente-pr.page.html',
+  styleUrls: ['./opts-expediente-pr.page.scss'],
+})
+export class OptsExpedientePrPage implements OnInit {
+
+  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"];
+
+  customDate:any;
+
+  task: any;
+  fulltask: any;
+  eventsList: Event[];
+  serialnumber: string;
+  profile: string;
+
+  loggeduser: User;
+
+  constructor(
+    private popoverController: PopoverController,
+    private modalController: ModalController,
+    private processes: ProcessesService,
+    private attachments: AttachmentsService,
+    private activatedRoute: ActivatedRoute,
+    private userAuth: AuthService,
+    private navParams: NavParams,
+  ) {
+
+    this.task = this.navParams.get('task');
+    this.fulltask = this.navParams.get('fulltask');
+
+    this.loggeduser = userAuth.ValidatedUser;
+    this.activatedRoute.queryParams.subscribe(params => {
+      if(params["serialNumber"]) {
+        this.serialnumber = params["serialNumber"];
+        console.log(params["serialNumber"]);
+      }
+    });
+    this.profile = "mdgpr";
+  }
+
+  ngOnInit() {
+
+
+  }
+
+  async openAddNoteModal(actionName:string) {
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop'
+    }
+    const modal = await this.modalController.create({
+      component: AddNotePage,
+      componentProps:{
+      },
+      cssClass: classs,
+      backdropDismiss: true
+    });
+  
+    await modal.present();
+  
+    modal.onDidDismiss().then(res => {
+      console.log(res);
+      if(res.data){
+        const DocumentToSave = res.data.documents.map((e) => {
+          return {
+            ApplicationId: e.ApplicationType,
+            SourceId: e.Id,
+          }
+        });
+    
+        let docs = {
+          ProcessInstanceID: "",
+          Attachments: DocumentToSave,
+        }
+
+        if(actionName == 'Aprovar'){
+          this.approve(res.data.note, docs);
+        }
+        else if(actionName == 'Revisão'){
+          this.sendToReview(res.data.note, docs);
+        }
+        this.goBack();
+      }
+    });
+  }
+
+  async approve(note:string, documents:any){
+    let body = { 
+      "serialNumber": this.serialnumber, 
+      "action": "Aprovar",
+      "ActionTypeId": 100000004 ,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList" :documents,
+    }
+
+    try {
+      await this.processes.CompleteTask(body);
+      this.close();
+      this.successMessage()
+    } catch(error) {
+      this.badRequest()
+    }
+  }
+
+  async distartExpedientModal(body:any) {
+    console.log(this.fulltask);
+    const modal = await this.modalController.create({
+      component: DiscartExpedientModalPage,
+       componentProps: {
+        serialNumber: this.fulltask.serialNumber,
+        folderId: this.fulltask.workflowInstanceDataFields.FolderID,
+        action: 'complete',
+      },
+      cssClass: 'discart-expedient-modal',
+      backdropDismiss: false
+    });
+    
+    await modal.present();
+    modal.onDidDismiss().then(res=>{
+      console.log(res['data']);
+      if(res['data']== 'Yes'){
+        this.processes.CompleteTask(body);
+        this.goBack(); 
+      }
+      else if(res['data'] == 'No'){
+        let otherbody = {
+          "serialNumber": body.serialNumber,
+          "action": "Passivo",
+          "ActionTypeId": 99999877,
+          "dataFields": {
+            "Note": "",
+          }
+        }
+        this.processes.CompleteTask(otherbody);
+      }
+      //Volta na lista principal
+      this.goBack();
+      this.modalController.dismiss();
+      
+    });
+  }
+
+
+  async sendToReview(note:string, documents:any){
+    let body = { 
+      "serialNumber": this.serialnumber, 
+      "action": "Retificar",
+      "ActionTypeId": 99999877,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList" :documents,
+    }
+
+    try {
+      await this.processes.CompleteTask(body);
+      this.close();
+      this.successMessage()
+    } catch(error) {
+      this.badRequest()
+    }
+  }
+
+  sendExpedienteToPending(){
+    this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
+      console.log(res);
+      this.close();
+    });
+  }
+
+  async openExpedientActionsModal(taskAction: any, task: any) {
+    //this.modalController.dismiss();
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+    const modal = await this.modalController.create({
+      component: ExpedientTaskModalPage,
+      componentProps: {
+        taskAction: taskAction,
+        task: task,
+        profile: this.profile,
+      },
+      cssClass: classs,
+    });
+    await modal.present();
+    modal.onDidDismiss().then(res=>{
+      console.log(res['data']);
+      let body = res['data'];
+      // alert('close '+ res['data'])
+      if(res['data']){
+        console.log('open discart');
+        
+        this.distartExpedientModal(body);
+
+      }
+      else{
+        console.log('Not open');
+        
+      }
+
+    });
+  }
+
+  async openBookMeetingModal(task: any) {
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'book-meeting-modal modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+    const modal = await this.modalController.create({
+      component: BookMeetingModalPage,
+      componentProps: {
+        task: this.task,
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+    await modal.present();
+    modal.onDidDismiss();
+  }
+
+
+  close() {
+    if( window.innerWidth <= 1024) {
+      this.popoverController.dismiss();
+    }
+    else{
+      this.modalController.dismiss();
+    }
+  }
+
+  goBack() {
+    // let navigationExtras: NavigationExtras = {
+    //   queryParams: {
+    //     "expedientes-pr": true,
+    //   }
+    // };
+    // this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+
+    window.history.back();
+
+  }
+
+
+  async successMessage(message?: string) {
+    
+    const modal = await this.modalController.create({
+      component: SuccessMessageComponent,
+       componentProps: {
+        message: message || 'Processo efetuado' ,
+      },
+      cssClass: 'modal modal-desktop'
+    });
+
+    modal.present()
+    
+    setTimeout(()=>{
+      modal.dismiss()
+    },3000)
+    
+  }
+
+  async badRequest() {
+    const modal = await this.modalController.create({
+      component: BadRequestComponent,
+       componentProps: {
+        message: 'hello',
+      },
+      cssClass: 'modal modal-desktop'
+    });
+
+    modal.present()
+    
+    setTimeout(()=>{
+      modal.dismiss()
+    },1000)
+  }
+  
+}

src/app/shared/popover/request-options/request-options-routing.module.ts

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

src/app/shared/popover/request-options/request-options.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { RequestOptionsPageRoutingModule } from './request-options-routing.module';
+
+import { RequestOptionsPage } from './request-options.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    RequestOptionsPageRoutingModule
+  ],
+  declarations: [RequestOptionsPage]
+})
+export class RequestOptionsPageModule {}

src/app/shared/popover/request-options/request-options.page.html

@@ -0,0 +1,54 @@
+<ion-content class="container">
+  <div class="arrow-right" (click)="close()">
+    <button class="btn-no-color">
+      <ion-icon slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
+    </button>
+  </div>
+
+  <div *ngIf="task.WorkflowName == 'Pedido de Deferimento'">
+    <div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Deferimento'">
+      <button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
+      <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
+      <div class="solid"></div>
+      <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
+      <button (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
+      <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+      <button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+    </div>
+    <div class="buttons" *ngIf="task.activityInstanceName == 'Reapreciar Deferimento'">
+      <button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
+      <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
+      <div class="solid"></div>
+      <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
+      <button (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
+      <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+      <button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+    </div>
+    <div class="buttons" *ngIf="task.activityInstanceName == 'Concluir Deferimento'">
+      <button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
+      <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
+      <div class="solid"></div>
+      <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
+      <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
+      <button (click)="openAddNoteModal('Solicitar Reapreciação')" class="btn-cancel" shape="round" >Solicitar Reapreciação</button>
+      <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+      <button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+    </div>
+  </div>
+  <div *ngIf="task.WorkflowName == 'Pedido de Parecer'">
+    <div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Parecer'">
+      <button (click)="openDarParecer(task)" class="btn-cancel" shape="round" >Dar o meu Parecer</button>
+      <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+      <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+      <button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+    </div>
+    <div class="buttons" *ngIf="task.activityInstanceName == 'Concluir Parecer'">
+      <button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
+      <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
+      <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
+      <button (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
+      <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+      <button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+    </div>
+  </div>
+</ion-content>

src/app/shared/popover/request-options/request-options.page.scss

@@ -0,0 +1,56 @@
+.container{
+    --padding-top:20px !important;
+   --padding-bottom:20px !important;
+   --padding-start:20px !important;
+   --padding-end:20px !important;
+}
+.arrow-right{
+    display: none;
+    margin-bottom: 20px;
+    .arrow-right-icon{
+        width: 37px;
+        float: right;
+        font-size: 35px;
+        overflow: hidden;
+    }
+}
+.buttons{
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-around;
+}
+.solid {
+    display: none;
+    width: 90%;
+    border-top: 1px solid #bbb;
+    margin: 0 auto !important;
+  }
+  .btn-ok, .btn-cancel{
+    //width: 50% !important;
+    margin-bottom: 5px !important;
+    margin-top: 5px !important;
+}
+@media only screen and (max-width: 800px) {
+    .btn-ok, .btn-cancel, .btn-delete{
+        width: 47% !important;
+    }
+}
+@media only screen and (min-width: 1024px) {
+    .arrow-right{
+        display: flex;
+        justify-content: flex-end;
+    }
+    .btn-cancel{
+        display: none;
+        width: 100% !important;
+        margin-bottom: 10px !important;
+    }
+    .btn-delete, .btn-ok{
+        width: 100% !important;
+        margin-bottom: 10px !important;
+        margin-top: 10px !important;
+    }
+   /*  .solid{
+        display: block;
+    } */
+}

src/app/shared/popover/request-options/request-options.page.spec.ts

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

src/app/shared/popover/request-options/request-options.page.ts

@@ -0,0 +1,268 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { ModalController, NavParams, PopoverController } from '@ionic/angular';
+import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
+import { DarParecerPage } from 'src/app/modals/dar-parecer/dar-parecer.page';
+import { DelegarPage } from 'src/app/modals/delegar/delegar.page';
+import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
+import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
+import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
+import { ProcessesService } from 'src/app/services/processes.service';
+
+
+@Component({
+  selector: 'app-request-options',
+  templateUrl: './request-options.page.html',
+  styleUrls: ['./request-options.page.scss'],
+})
+export class RequestOptionsPage implements OnInit {
+
+  task:any;
+  fulltask: any;
+  profile:string;
+  serialnumber : string
+  showEnviarPendentes = false
+
+  constructor(
+    private popoverController: PopoverController,
+    private modalController: ModalController,
+    private navParams: NavParams,
+    private processes: ProcessesService,
+    private activatedRoute: ActivatedRoute,
+  ) { 
+    this.task = this.navParams.get('task');
+    this.fulltask = this.navParams.get('fulltask');
+    
+    this.activatedRoute.queryParams.subscribe(params => {
+      if(params["serialNumber"]) {
+        this.serialnumber = params["serialNumber"];
+        // console.log(params["serialNumber"]);
+      }
+    });
+
+    
+
+    this.showEnviarPendentes = this.navParams.get('showEnviarPendentes');
+
+    if(!this.showEnviarPendentes) this.showEnviarPendentes = false
+
+  }
+
+  ngOnInit() {
+    console.log(this.task);
+    this.profile = "mdgpr";
+    
+    window.onresize = (event) => {
+      if( window.innerWidth >= 800){
+        this.popoverController.dismiss();
+      }
+    };
+  }
+
+  close(){
+    if( window.innerWidth <= 1024){
+      this.popoverController.dismiss();
+    }
+    else{
+      this.modalController.dismiss();
+    }
+  }
+
+  sendExpedienteToPending(){
+    this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{
+      console.log(res);
+      this.close();
+    });
+  }
+
+  async openBookMeetingModal(task: any) {
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'book-meeting-modal modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+    const modal = await this.modalController.create({
+      component: BookMeetingModalPage,
+      componentProps: {
+        task: this.task,
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+    await modal.present();
+    modal.onDidDismiss();
+  }
+
+  async openExpedientActionsModal(taskAction: any, task: any) {
+    //this.modalController.dismiss();
+    let classs;
+    if( window.innerWidth <= 800) {
+      classs = 'modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+    const modal = await this.modalController.create({
+      component: ExpedientTaskModalPage,
+      componentProps: {
+        taskAction: taskAction,
+        task: task,
+        profile: this.profile,
+      },
+      cssClass: classs,
+    });
+    await modal.present();
+    modal.onDidDismiss().then(res=>{
+      console.log(res['data']);
+      if(res['data']=='openDiscart'){
+        console.log('open discart');
+        
+        this.distartExpedientModal();
+
+      }
+
+    });
+  }
+
+  async distartExpedientModal(){
+    console.log(this.fulltask);
+    const modal = await this.modalController.create({
+      component: DiscartExpedientModalPage,
+       componentProps: {
+        serialNumber: this.fulltask.serialNumber,
+        folderId: this.fulltask.workflowInstanceDataFields.FolderID,
+        action: 'complete',
+      },
+      cssClass: 'discart-expedient-modal',
+      backdropDismiss: false
+    });
+    
+    await modal.present();
+    modal.onDidDismiss().then(res=>{
+      if(res['data']=='close'){
+        this.close();
+        /* console.log('2Expedient Discard closed2');
+        this.close();
+        this.openMenu(); */
+      }
+      
+    });
+  }
+
+  repreciar(note:string, documents:any) {
+    let body = { 
+      "serialNumber": this.serialnumber, 
+      "action": "Reapreciação",
+      "ActionTypeId": 100000009,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList" :documents,
+    }
+    this.processes.CompleteTask(body);
+    this.close();
+  }
+
+  async openAddNoteModal(actionName:string) {
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop'
+    }
+    const modal = await this.modalController.create({
+      component: AddNotePage,
+      componentProps:{
+      },
+      cssClass: classs,
+      backdropDismiss: true
+    });
+  
+    await modal.present();
+  
+    modal.onDidDismiss().then(res => {
+
+
+      const DocumentToSave = res.data.documents.map((e) => {
+        return {
+          ApplicationId: e.ApplicationType,
+          SourceId: e.Id,
+        }
+      });
+  
+      let docs = {
+        ProcessInstanceID: "",
+        Attachments: DocumentToSave,
+      }
+
+
+      if(res.data){
+        if(actionName == 'Solicitar Reapreciação') {
+
+          this.repreciar(res.data.note, docs);
+        }
+        else if(actionName == 'Arquivar'){
+          this.arquivar(res.data.note, docs);
+        }
+      }
+    });
+  }
+
+  arquivar(note:string, documents:any) {
+    let body = { 
+      "serialNumber": this.serialnumber, 
+      "action": "Arquivo",
+      "ActionTypeId": 95,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList" :documents,
+    }
+    this.processes.CompleteTask(body);
+    this.close();
+  }
+
+  async openDarParecer(task: any) {
+    console.log(task);
+    
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'book-meeting-modal modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+    const modal = await this.modalController.create({
+      component: DarParecerPage,
+      componentProps: {
+        serialNumber: this.task.SerialNumber,
+        ProcessInstanceID: this.task.ProcessInstanceID,
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+    await modal.present();
+    modal.onDidDismiss();
+  }
+
+  async openDelegarModal(task: any) {
+    console.log(task);
+    
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'book-meeting-modal modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+    const modal = await this.modalController.create({
+      component: DelegarPage,
+      componentProps: {
+        task: this.task,
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+    await modal.present();
+    modal.onDidDismiss();
+  }
+
+}