From f21d49dc3a640c6ff2edbf1a9afd388db15d7288 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 16 Feb 2024 10:41:12 +0100 Subject: [PATCH] create dispatch from attachment --- .../view-document/view-document.page.ts | 5 ++- .../expedient-task-modal.page.ts | 38 ++++++++++++++++--- 2 files changed, 36 insertions(+), 7 deletions(-) diff --git a/src/app/modals/view-document/view-document.page.ts b/src/app/modals/view-document/view-document.page.ts index c9fe527e3..5f32c03fd 100644 --- a/src/app/modals/view-document/view-document.page.ts +++ b/src/app/modals/view-document/view-document.page.ts @@ -172,7 +172,10 @@ export class ViewDocumentPage implements OnInit { taskAction: taskAction, // check task: this.task, // check document: this.Document, // nope - aplicationId: this.Document.ApplicationId || this.Document.ApplicationID // check + aplicationId: this.Document.ApplicationId || this.Document.ApplicationID, // check + applicationId: this.applicationId, + docId: this.docId, + createProcessFromFile: true, }, cssClass: classs, }); diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts index 99acd47cd..b28900f29 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { ModalController, NavParams } from '@ionic/angular'; import { Despacho } from 'src/app/models/despacho.model'; @@ -27,6 +27,7 @@ import { PermissionService } from 'src/app/services/permission.service'; import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; import { RouteService } from 'src/app/services/route.service'; import { TaskService } from 'src/app/services/task.service' +import { z } from 'zod'; const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { parse: { @@ -41,6 +42,12 @@ const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { } +const createProcessFromFileSchema = z.object({ + applicationId: z.any(), + docId: z.any(), +}); + + @Component({ selector: 'app-expedient-task-modal', templateUrl: './expedient-task-modal.page.html', @@ -59,6 +66,8 @@ export class ExpedientTaskModalPage implements OnInit { taskType:string; task: task; aplicationId = null + docId!: string + createProcessFromFile: false taskParticipants: any = []; taskParticipantsCc: any = []; @@ -121,14 +130,31 @@ export class ExpedientTaskModalPage implements OnInit { this.loggeduser = SessionStore.user; this.task = this.navParams.get('task'); - - this.SearchFolder = this.navParams.get('SearchFolder'); - this.aplicationId = this.navParams.get('aplicationId') - this.document = this.navParams.get('document') + this.aplicationId = this.navParams.get('aplicationId') | this.navParams.get('applicationId') + this.docId = this.navParams.get('docId') + this.createProcessFromFile = this.navParams.get('createProcessFromFile') || false; + this.document = this.navParams.get('document'); this.taskType = this.navParams.get('taskAction'); + + if(this.createProcessFromFile) { + try { + createProcessFromFileSchema.parse({ + applicationId: this.aplicationId, + docId: this.docId + }); + + this.task.workflowInstanceDataFields.SourceSecFsID = this.aplicationId; //361 + this.task.workflowInstanceDataFields.SourceType = 'DOC'; //FOLDER + this.task.workflowInstanceDataFields.SourceID = this.docId; //FolderId + + } catch (error) { + console.error('Validation failed params, expediente-task-modal:', error.errors); + } + } + // try { // if(this.document) { // const doc: any = this.document @@ -475,7 +501,7 @@ export class ExpedientTaskModalPage implements OnInit { this.validateField = true; this.toastService._badRequest('Por favor selecione um assunto'); } */ - + /* } else{ this.validateField = true;