From 78c6ac2f36c0f45a45f84de70f0b8ee4cbf17ffc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Mon, 29 Jan 2024 13:43:49 +0100 Subject: [PATCH] diplmas signaure solved --- src/app/models/dailyworktask.model.ts | 3 +- .../diploma-assinar/diploma-assinar.page.ts | 10 +++--- .../diplomas/diploma/diploma.page.ts | 1 + .../expediente-detail.page.ts | 3 +- .../expediente-pr/expediente-pr.page.ts | 3 +- .../new-publication/new-publication.page.ts | 34 ++++++++++++++++--- .../deploma-options/deploma-options.page.ts | 8 +++-- .../event-details-documents-options.page.ts | 2 ++ .../new-publication/new-publication.page.ts | 3 +- 9 files changed, 51 insertions(+), 16 deletions(-) diff --git a/src/app/models/dailyworktask.model.ts b/src/app/models/dailyworktask.model.ts index 452b50758..26884ad0b 100644 --- a/src/app/models/dailyworktask.model.ts +++ b/src/app/models/dailyworktask.model.ts @@ -170,7 +170,8 @@ export interface expedienteTask { Status : string DispatchNumber: any AttachmentsProcessLastInstanceID: any - InstanceID: any + InstanceID: any, + DraftIds: string } export interface ExpedienteTask { diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts index 0064d51aa..5cadb1f40 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts @@ -129,11 +129,14 @@ export class DiplomaAssinarPage implements OnInit { "TaskStartDate": res.taskStartDate, "InstanceID": res.workflowInstanceDataFields.InstanceID, "FolderID": res.workflowInstanceDataFields.FolderID, + "DraftIds": res.workflowInstanceDataFields?.DraftIds } + console.log('draftidsss',res.workflowInstanceDataFields.DraftIds); this.fulltask = res; let stringDraft = res.workflowInstanceDataFields.DraftIds; - this.DraftIds = stringDraft + this.DraftIds = res.workflowInstanceDataFields.DraftIds + console.log('draftidsss 111',this.DraftIds); let split_stringDraft = stringDraft?.split(";").filter(Boolean); @@ -233,11 +236,9 @@ export class DiplomaAssinarPage implements OnInit { "dataFields": { "ReviewUserComment": '', "InstanceIDNew": this.task.InstanceID, - "DraftIds": "", }, "AttachmentList": { "ProcessInstanceID": this.task.InstanceID, - "DraftIds": null, "Attachments": [] }, } @@ -269,10 +270,11 @@ export class DiplomaAssinarPage implements OnInit { modal.onDidDismiss().then(async (res) => { const data = res.data if (data == "Yes") { + console.log(' diploma Draft draft',this.task.DraftIds) let body = { "InstanceId": this.task.InstanceID, "FolderId": this.task.FolderID, - "DraftIds": this.DraftIds, + "DraftIds": this.task.DraftIds, "OriginalFileName": this.DraftNames } diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts index 549dcf098..acf778492 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts @@ -137,6 +137,7 @@ export class DiplomaPage implements OnInit { "WorkflowName": res.workflowDisplayName, "DeadlineType": res.workflowInstanceDataFields.DeadlineType, "activityInstanceName": res.activityInstanceName, + "DraftIds": res.workflowInstanceDataFields?.DraftIds } this.fulltask = res; console.log('Diploma anexo',this.fulltask.Documents ) diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index e457802f2..09d367c4d 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -370,7 +370,8 @@ export class ExpedienteDetailPage implements OnInit { "Status": res.workflowInstanceDataFields.Status, "DispatchNumber": res.workflowInstanceDataFields.DispatchNumber, "AttachmentsProcessLastInstanceID": res.workflowInstanceDataFields.AttachmentsProcessLastInstanceID, - "InstanceID": res.workflowInstanceDataFields.InstanceID + "InstanceID": res.workflowInstanceDataFields.InstanceID, + "DraftIds": res.workflowInstanceDataFields?.DraftIds } this.fulltask = res; diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts index 6859b51f8..44eab1ef5 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts +++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts @@ -132,7 +132,8 @@ export class ExpedientePrPage implements OnInit { "activityInstanceName": res.activityInstanceName, "Status": res.workflowInstanceDataFields.Status, "Deadline": res.deadline, - "TaskStartDate": res.taskStartDate + "TaskStartDate": res.taskStartDate, + "DraftIds": res.workflowInstanceDataFields?.DraftIds } this.fulltask = res; diff --git a/src/app/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts index 4fa09463c..620b320ca 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.ts +++ b/src/app/pages/publications/new-publication/new-publication.page.ts @@ -252,7 +252,7 @@ export class NewPublicationPage implements OnInit { .then(async (content) => { this.filecontent = true; let fileObject = { - FileBase64: content.data, + FileBase64: 'data:video/mp4;base64,'+content.data, FileExtension: 'mp4', OriginalFileName: 'video' } @@ -292,11 +292,21 @@ export class NewPublicationPage implements OnInit { console.log(result) console.log(content) this.filecontent = true; - let fileObject = { - FileBase64: content.data, - FileExtension: this.removeTextBeforeSlash(element.mimeType, '/'), - OriginalFileName: 'video' + let fileObject; + if(this.removeTextBeforeSlash(element.mimeType, '/') == "mp4") { + fileObject = { + FileBase64: 'data:video/mp4;base64,'+ content.data, + FileExtension: this.removeTextBeforeSlash(element.mimeType, '/'), + OriginalFileName: 'video' + } + } else { + fileObject = { + FileBase64: content.data, + FileExtension: this.removeTextBeforeSlash(element.mimeType, '/'), + OriginalFileName: 'image' + } } + this.seletedContent.push(fileObject) }) .catch((err) => console.error(err)); @@ -479,6 +489,18 @@ export class NewPublicationPage implements OnInit { const date = formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss') + /* this.seletedContent = this.seletedContent.map((e) => { + if(e.FileExtension == "mp4") { + return { + FileBase64: e.FileBase64, + FileExtension: 'data:video/mp4;base64,'+e.FileExtension, + OriginalFileName: "video", + } + } + + return e + }) */ + /* if (this.capturedImage != '') { */ this.publication = { DateIndex: date, @@ -511,6 +533,8 @@ export class NewPublicationPage implements OnInit { try { + + await this.publications.CreatePublication(this.folderId, this.publication).toPromise(); this.close(); this.httpErrorHandle.httpsSucessMessagge('Criar publicação') diff --git a/src/app/shared/popover/deploma-options/deploma-options.page.ts b/src/app/shared/popover/deploma-options/deploma-options.page.ts index ee7309384..e7dfd6241 100644 --- a/src/app/shared/popover/deploma-options/deploma-options.page.ts +++ b/src/app/shared/popover/deploma-options/deploma-options.page.ts @@ -217,11 +217,11 @@ export class DiplomaOptionsPage implements OnInit { "dataFields": { "ReviewUserComment": note, "InstanceIDNew": this.task.InstanceID, - "DraftIds": "", + /* "DraftIds": "", */ }, "AttachmentList": { "ProcessInstanceID": this.task.InstanceID, - "DraftIds": null, + /* "DraftIds": null, */ "Attachments": [] }, } @@ -256,10 +256,12 @@ export class DiplomaOptionsPage implements OnInit { modal.onDidDismiss().then(async (res) => { const data = res.data if (data == "Yes") { + + console.log(' diploma options Draft draft',this.DraftIds) let body = { "InstanceId": this.task.InstanceID, "FolderId": this.task.FolderID, - "DraftIds": this.DraftIds, + "DraftIds": this.task.DraftIds, "OriginalFileName": this.DraftNames } const loader = this.toastService.loading() diff --git a/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.ts b/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.ts index 878a2e572..f847f7f78 100644 --- a/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.ts +++ b/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.ts @@ -148,6 +148,8 @@ export class EventDetailsDocumentsOptionsPage implements OnInit { modal.onDidDismiss().then(async (res) => { const data = res.data if(data == "Yes") { + + console.log(' event detais Draft draft',this.DraftIds) let body = { "InstanceId": this.InstanceID, "FolderId": this.FolderID, diff --git a/src/app/shared/publication/new-publication/new-publication.page.ts b/src/app/shared/publication/new-publication/new-publication.page.ts index 06eacfc04..4f6f9b84c 100644 --- a/src/app/shared/publication/new-publication/new-publication.page.ts +++ b/src/app/shared/publication/new-publication/new-publication.page.ts @@ -359,7 +359,7 @@ export class NewPublicationPage implements OnInit { .then(async (content) => { console.log(result) - console.log(content) + console.log('load video tablet base64',content) this.filecontent = true; let fileObject = new PublicationAttachmentEntity ({ base64: content.data, @@ -1002,6 +1002,7 @@ export class NewPublicationPage implements OnInit { .then(async (content) => { this.filecontent = true; + console.log('',content) let fileObject = new PublicationAttachmentEntity({ base64: content.data, extension: 'mp4',