diff --git a/src/app/modals/document-detail/document-detail.page.ts b/src/app/modals/document-detail/document-detail.page.ts index 047a19fdc..0efb39141 100644 --- a/src/app/modals/document-detail/document-detail.page.ts +++ b/src/app/modals/document-detail/document-detail.page.ts @@ -72,33 +72,9 @@ export class DocumentDetailPage implements OnInit { let folder: SearchFolderDetails = this.LoadedDocument if(this.LoadedDocument.ApplicationID == 361 || this.LoadedDocument.ApplicationId == 361) { - // task = { - // serialNumber: folder.DispatchNumber, - // taskStartDate: folder.DateDispatch, - // isEvent: true, - // workflowInstanceDataFields: { - // FolderID: folder['FolderId'] || folder['FolderID'] || folder.folderId, - // Subject: folder.Assunto, - // SourceSecFsID: folder.ApplicationID || folder['ApplicationId'], - // SourceType: 'FOLDER', - // SourceID: folder.folderId, - // DispatchNumber: folder.DispatchNumber - // }, - // } + } else if (document.ApplicationID == 8 || document.ApplicationId == 8) { - // task = { - // serialNumber: document.DocId, - // taskStartDate: document.DocDate, - // isEvent: true, - // workflowInstanceDataFields: { - // FolderID: null, - // Subject: document.Assunto, - // DispatchNumber: null, - // SourceSecFsID: document.ApplicationID || document.folderId, - // SourceType: 'DOC', - // SourceID: document.DocId, - // } - // } + } else { console.log('unexpected ApplicationID') } @@ -155,7 +131,7 @@ export class DocumentDetailPage implements OnInit { const selectedDoc = this.LoadedDocument.Documents[ this.dicIndex] - this.task = { + let task = { serialNumber: '', taskStartDate: '', isEvent: true, @@ -174,15 +150,15 @@ export class DocumentDetailPage implements OnInit { componentProps: { trustedUrl: '', file: { - title: this.task.workflowInstanceDataFields.Subject, + title: task.workflowInstanceDataFields.Subject, url: '', title_link: '', }, Document: this.LoadedDocument.Documents[ this.dicIndex], - applicationId: this.task.workflowInstanceDataFields.SourceSecFsID, - docId: this.task.workflowInstanceDataFields.SourceID , + applicationId: task.workflowInstanceDataFields.SourceSecFsID, + docId: task.workflowInstanceDataFields.SourceID , folderId: '', - task: this.task + task: task }, cssClass: 'modal modal-desktop' }); @@ -215,7 +191,7 @@ export class DocumentDetailPage implements OnInit { component: ExpedientTaskModalPage, componentProps: { taskAction: taskAction, - task: this.task, + task: this.DocumentTask, seachDocuments: this.LoadedDocument, aplicationId: this.LoadedDocument.ApplicationId || this.LoadedDocument.ApplicationID }, @@ -238,7 +214,7 @@ export class DocumentDetailPage implements OnInit { const modal = await this.modalController.create({ component: DocumentSetUpMeetingPage, componentProps: { - subject: this.task.workflowInstanceDataFields.Subject, + subject: this.LoadedDocument.Assunto, document: this.LoadedDocument, }, cssClass: classs, diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts index 74beab957..947058b71 100644 --- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts +++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts @@ -184,7 +184,6 @@ export class DocumentSetUpMeetingPage implements OnInit { } else{ console.log(this.document); -alert('PARA') this.docs.push({ ApplicationId: this.document.ApplicationId || this.document.ApplicationType, Source: 1, diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts index 48104a7d7..f033435a5 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts +++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts @@ -109,6 +109,8 @@ export class DespachoPrPage implements OnInit { "activityInstanceName": res.activityInstanceName, } this.fulltask = res; + + console.log(this.task); console.log('GetTask', res); 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 bb6b2a947..9429153b1 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 @@ -110,6 +110,9 @@ export class ExpedientTaskModalPage implements OnInit { this.loggeduser = userAuth.ValidatedUser; this.task = this.navParams.get('task'); + + console.log('create dispatch with this data', this.task); + this.SearchFolder = this.navParams.get('SearchFolder'); this.aplicationId = this.navParams.get('aplicationId')