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

This commit is contained in:
Peter Maquiran
2021-05-03 10:49:29 +01:00
3 changed files with 15 additions and 6 deletions
@@ -191,17 +191,24 @@ export class CreateProcessPage implements OnInit {
this.processes.postDeferimento(this.postData);
break;
}
this.modalController.dismiss();
/* this.distartExpedientModal();
this.close(); */
this.executado();
this.modalController.dismiss();
}
else {
this.alertController.presentAlert("Lista de intervenientes vazia. Por favor, adicione 1 ou mais intervenientes.");
}
}
executado(){
let body = {
"serialNumber": this.task.serialNumber,
"action": "Conhecimento",
"dataFields": {
"ReviewerComments": '',
}
}
this.processes.PostTaskAction(body);
}
getAttachments() {
this.attachmentsService.getAttachmentsBySerial(this.task.serialNumber).subscribe(res=>{
@@ -14,6 +14,7 @@ import { momentG } from 'src/plugin/momentG'
import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page';
import { ExpedientTaskModalPage } from '../../expediente/expedient-task-modal/expedient-task-modal.page';
import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-meeting-modal.page';
import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page';
@Component({
selector: 'app-pedido',
@@ -199,7 +200,7 @@ export class PedidoPage implements OnInit {
classs = 'modal modal-desktop showAsideOptions'
}
const modal = await this.modalController.create({
component: ExpedientTaskModalPage,
component: CreateProcessPage,
componentProps: {
taskAction: taskAction,
task: task,
@@ -93,6 +93,7 @@ export class PedidosPage implements OnInit {
this.taskType = "Pedido de Deferimento";
this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(result => {
this.taskslist = result;
console.log(result);
this.deferimentoList = new Array();