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

src/app/shared/gabinete-digital/generic/task-details/task-details.page.html

@@ -123,12 +123,12 @@
           <div [ngClass]="{'header-fix': !dropButton}" style="border-radius: 50px;position: relative;top: 3px;left: 25px;">
 
             <ion-row class="timeline-date align-center pr-10 visionMobile-flex"  >
-              <button class="no-color" [ngClass]="{'d-item': !dropButton}" (click)="changeDropButton()"  >
+              <button style="z-index: 99;" class="no-color" [ngClass]="{'d-item': !dropButton}" (click)="changeDropButton()"  >
                 <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="collaps  font-25" src="assets/images/icons-collaps-up.svg" ></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="collaps  font-25" src="assets/images/theme/gov/icons-collaps-up.svg" ></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' "  class="collaps  font-25"  src="assets/images/theme/{{ThemeService.currentTheme}}/icons-collaps-up.svg"></ion-icon>
               </button>
-              <button  class="no-color visionMobile-flex" *ngIf="!dropButton" (click)="changeDropButton()">
+              <button  style="z-index: 99;" class="no-color visionMobile-flex" *ngIf="!dropButton" (click)="changeDropButton()">
                 <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="collaps  font-25" src="assets/images/icons-collaps-down.svg" ></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="collaps  font-25" src="assets/images/theme/gov/icons-collaps-down.svg" ></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="collaps  font-25" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-collaps-down.svg" ></ion-icon>

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
       }

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)
             })

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 {