diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts index 227d189de..11aedbef8 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts @@ -115,7 +115,7 @@ export class OptsExpedientePage implements OnInit { component: SearchPage, cssClass: 'modal-width-100-width-background modal', componentProps: { - type: 'AccoesPresidenciais & ArquivoDespachoElect', + type: 'Correspondencia', showSearchInput: true, select: true } 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 9e36fc5c4..effa8a82c 100644 --- a/src/app/shared/publication/new-publication/new-publication.page.ts +++ b/src/app/shared/publication/new-publication/new-publication.page.ts @@ -214,7 +214,7 @@ export class NewPublicationPage implements OnInit { FileType: 'image' } ) - newAttachment.needUpload(); + //newAttachment.needUpload(); this.publicationFormMV.form.Files.push(newAttachment) }); @@ -252,7 +252,7 @@ export class NewPublicationPage implements OnInit { } ) - newAttachment.needUpload() + // newAttachment.needUpload() this.publicationFormMV.form.Files.push(newAttachment) this.filecontent = true; @@ -368,7 +368,7 @@ export class NewPublicationPage implements OnInit { const publication: any = Object.assign({}, this.publicationFormMV.form) publication.Files = publication.Files.map( (e:PublicationAttachmentEntity) => ({ - FileBase64: e.Base64, + FileBase64: e.url, FileExtension: e.FileExtension, OriginalFileName: e.OriginalFileName || 'foto' })) @@ -420,7 +420,7 @@ export class NewPublicationPage implements OnInit { const publication: any = Object.assign({}, this.publicationFormMV.form) publication.Files = publication.Files.map( (e:PublicationAttachmentEntity) => ({ - FileBase64: e.Base64, + FileBase64: e.url, FileExtension: e.FileExtension, OriginalFileName: e.OriginalFileName || 'foto' })) @@ -809,13 +809,13 @@ console.log(stringGerada); console.log('', content) let fileObject; if(this.platform.is('desktop')) { - + fileObject = new PublicationAttachmentEntity({ base64: content.data, extension: 'mp4', OriginalFileName: 'record', FileType: 'video' - + }) } else { fileObject = new PublicationAttachmentEntity({ @@ -823,10 +823,10 @@ console.log(stringGerada); extension: 'mp4', OriginalFileName: 'record', FileType: 'video' - + }) } - + /* fileObject.needUpload() */ this.publicationFormMV.form.Files.push(fileObject) }) diff --git a/src/app/shared/publication/upload/upload-streaming.service.ts b/src/app/shared/publication/upload/upload-streaming.service.ts index a5a995ef1..cc686674a 100644 --- a/src/app/shared/publication/upload/upload-streaming.service.ts +++ b/src/app/shared/publication/upload/upload-streaming.service.ts @@ -148,14 +148,14 @@ export class PublicationAttachmentEntity { const sanitizer : DomSanitizer = window["sanitizer"] if(this.FileType == 'image' ) { - if(!this.Base64.startsWith('data:')) { + if(!this.Base64.includes('data:')) { this.url = 'data:image/jpg;base64,' + this.Base64 // this.url = sanitizer.bypassSecurityTrustUrl('data:image/jpg;base64,' + this.Base64) as any } else { this.url = this.Base64 } } else if (this.FileType == 'video' ) { - if(!this.Base64.startsWith('data:') && !this.Base64.startsWith('http')) { + if(!this.Base64.includes('data:') && !this.Base64.startsWith('http')) { this.url = 'data:video/mp4;base64,' + this.Base64 // this.url = sanitizer.bypassSecurityTrustUrl('data:video/mp4;base64,' + this.Base64) as any } else {