From eb17b9d310bfff614357e449d5a889c82d3da5d4 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Sun, 3 Mar 2024 12:21:34 +0100 Subject: [PATCH] fix reported issue --- src/app/services/publications.service.ts | 2 +- .../new-publication/new-publication.page.ts | 12 +++++++++--- .../publication/upload/upload-streaming.service.ts | 4 ++-- src/environments/environment.ts | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/app/services/publications.service.ts b/src/app/services/publications.service.ts index 786524fbc..30182c8d1 100644 --- a/src/app/services/publications.service.ts +++ b/src/app/services/publications.service.ts @@ -246,7 +246,7 @@ GetIdsPublicationNext(id:any){ body.Files = body.Files.map( e => ({ FileBase64: e.FileBase64, FileExtension: e.FileExtension, - OriginalFileName: 'foto' + OriginalFileName: e.OriginalFileName || 'foto' })) return this.http.put(`${geturl}`, body, options) 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 20e1a0db1..1928cd27a 100644 --- a/src/app/shared/publication/new-publication/new-publication.page.ts +++ b/src/app/shared/publication/new-publication/new-publication.page.ts @@ -110,6 +110,8 @@ export class NewPublicationPage implements OnInit { this.showLoader = true; this.publications.GetPublicationWithArrayOfFilesById(this.documentId).subscribe(res => { this.processData(res) + + console.log("res get", res) this.showLoader = false; }, (error) => { console.log(error) @@ -120,6 +122,8 @@ export class NewPublicationPage implements OnInit { } processData(res) { + + console.log("res process", res) this.publicationFormMV.form.Files = [] this.publicationFormMV.form.setData({ DateIndex: res.DateIndex, @@ -295,6 +299,8 @@ export class NewPublicationPage implements OnInit { OriginalFileName: 'video', FileType: this.checkFileType.checkFileType( this.removeTextBeforeSlash(element.mimeType, '/')) as any }) + + fileObject.needUpload() this.publicationFormMV.form.Files.push(fileObject) }) .catch((err) => console.error(err)); @@ -351,7 +357,7 @@ export class NewPublicationPage implements OnInit { if(upload) { this.publicationFormMV.form.Files = this.publicationFormMV.form.Files.map((e:PublicationAttachmentEntity)=> { - if(e.FileType == 'video') { + if(e.FileType == 'video' && e.toUpload) { e.OriginalFileName = e.chucksManager.path.replace(".mp4", "") e.FileExtension = "mp4" } @@ -427,8 +433,6 @@ export class NewPublicationPage implements OnInit { try { - console.log({publication}) - await this.publications.CreatePublication(publication.ProcessId, publication).toPromise() if (this.publicationTitle == '1') { @@ -781,6 +785,7 @@ console.log(stringGerada); } ) + fileObject.needUpload() this.publicationFormMV.form.Files.push(fileObject) }) .catch((erro) => console.error('read converted video erro ', erro)); @@ -810,6 +815,7 @@ console.log(stringGerada); } ) + fileObject.needUpload() this.publicationFormMV.form.Files.push(fileObject) }) .catch((err) => console.error(err)); diff --git a/src/app/shared/publication/upload/upload-streaming.service.ts b/src/app/shared/publication/upload/upload-streaming.service.ts index 419e81128..e3856a660 100644 --- a/src/app/shared/publication/upload/upload-streaming.service.ts +++ b/src/app/shared/publication/upload/upload-streaming.service.ts @@ -246,7 +246,7 @@ export class PublicationFormMV { if(!PublicationAttachmentEntity.hasChunkManger) { const fileBlob = PublicationAttachmentEntity.blobFile; - const fileChunks = new Chunks({chunkSize: 40 }) + const fileChunks = new Chunks({chunkSize: 400 }) fileChunks.setFile(fileBlob) PublicationAttachmentEntity.setChunkManger(fileChunks) @@ -303,7 +303,7 @@ export class PublicationFormMV { // this.ObjectMergeNotification.socket.registerWhenConnected(() => { const videosFiles = this.getVideoFiles() - const videosFilesToUploads = videosFiles.filter( e => e.FileType == "video") + const videosFilesToUploads = videosFiles.filter( e => e.FileType == "video" && e.toUpload) const Promises: Promise[] = [] diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 3bd65b833..983359e87 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,4 +4,4 @@ import { doneITDev } from './suport/doneIt' import { DevDev } from './suport/dev' -export const environment: Environment = oaprDev +export const environment: Environment = DevDev