diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index 227d8d729..3bdc7cedb 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -330,6 +330,8 @@ export class CreateProcessPage implements OnInit { try { await this.pedidoService.createDeferimento(this.postData).toPromise(); await this.pedidoService.taskCompleteDeferimento({serialNumber:this.task.serialNumber}).toPromise(); + alert('!!__!!') + this.modalController.dismiss(); this.toastService.successMessage('Pedido de Deferimento criado'); } @@ -465,7 +467,11 @@ export class CreateProcessPage implements OnInit { }, "AttachmentList" :null, } + + } else { + alert('!!!') } + console.log(body); try { diff --git a/src/app/shared/popover/request-options/request-options.page.ts b/src/app/shared/popover/request-options/request-options.page.ts index 35358223f..e403aab6d 100644 --- a/src/app/shared/popover/request-options/request-options.page.ts +++ b/src/app/shared/popover/request-options/request-options.page.ts @@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { AnimationController, ModalController, NavParams, PopoverController } from '@ionic/angular'; import { AddNotePage } from 'src/app/modals/add-note/add-note.page'; +import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page'; import { DarParecerPage } from 'src/app/modals/dar-parecer/dar-parecer.page'; import { DelegarPage } from 'src/app/modals/delegar/delegar.page'; import { PermissionService } from 'src/app/OtherService/permission.service'; @@ -117,21 +118,23 @@ export class RequestOptionsPage implements OnInit { classs = 'modal modal-desktop showAsideOptions' } const modal = await this.modalController.create({ - component: ExpedientTaskModalPage, + component: CreateProcessPage, componentProps: { taskAction: taskAction, task: task, profile: this.profile, + fulltask: this.fulltask }, cssClass: classs, }); await modal.present(); - modal.onDidDismiss().then(res=>{ + modal.onDidDismiss().then(res=> { console.log(res['data']); if(res['data']=='openDiscart'){ console.log('open discart'); this.distartExpedientModal(); + this.modalController.dismiss() }