Merge branch 'feature/viewer-attachment' of https://bitbucket.org/equilibriumito/gabinete-digital-fo into feature/viewer-attachment

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<any>(`${geturl}`, body, options)

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') {
 
@@ -782,6 +786,7 @@ console.log(stringGerada);
 
               }
               )
+              fileObject.needUpload()
               this.publicationFormMV.form.Files.push(fileObject)
     })
     .catch((erro) => console.error('read converted video erro ', erro));
@@ -811,6 +816,7 @@ console.log(stringGerada);
 
               }
               )
+              fileObject.needUpload()
               this.publicationFormMV.form.Files.push(fileObject)
             })
             .catch((err) => console.error(err));

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<any>[] = []
 

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