Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html

@@ -6,7 +6,7 @@
   </div>
   <div class="buttons">
     <button class="btn-cancel" shape="round" (click)="emendarTask()">Adicionar Nota</button>
-    <button class="btn-ok" shape="round" (click)="approveTask()">Aprovar</button>
+    <button class="btn-cancel" shape="round" (click)="approveTask()">Aprovar</button>
     <div class="solid"></div>
     <button class="btn-cancel" shape="round" (click)="editTask()">Editar</button>
     <button class="btn-delete" shape="round" (click)="rejeitar()">Rejeitar</button>

src/app/pages/chat/messages/messages.page.ts

@@ -1,7 +1,6 @@
 import { AfterViewChecked, AfterViewInit, Component, ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import {ActivatedRoute, Router} from '@angular/router'
 import { ModalController, NavParams, PopoverController } from '@ionic/angular';
-import { Status } from 'src/app/models/chat/status.model';
 import { ContactsPage } from 'src/app/pages/chat/messages/contacts/contacts.page';
 import { AlertService } from 'src/app/services/alert.service';
 import { AuthService } from 'src/app/services/auth.service';

src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html

@@ -85,7 +85,7 @@
         <button (click)="openAddNoteModal('Gerar Diploma')" class="btn-cancel" style="margin-bottom: 0px !important;" shape="round" >Gerar Diploma </button>
         <!-- <div class="solid"></div> -->
         <div class="option-desc">Outras opções</div>
-        <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
+        <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
         <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
         <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
         <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>

src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts

@@ -3,8 +3,8 @@ import { ProcessesService } from 'src/app/services/processes.service';
 import { AttachmentsService } from 'src/app/services/attachments.service';
 import { EventsService } from 'src/app/services/events.service';
 import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
-import { DailyWorkTask, fullTask } from '../../../../models/dailyworktask.model';
-import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
+import { fullTask } from '../../../../models/dailyworktask.model';
+import { ActivatedRoute, Router } from '@angular/router';
 
 import { Event } from '../../../../models/event.model';
 import { MenuController, ModalController, PopoverController } from '@ionic/angular';
@@ -293,8 +293,9 @@ export class DespachoPrPage implements OnInit {
 
   sendExpedienteToPending(){
     this.processes.SetTaskToPending(this.serialNumber).subscribe(res=>{
-      this.goBack();
+      this.popoverController.dismiss('close')
       this.toastService.successMessage('Processo enviado para pendentes')
+      this.goBack()
     },()=>{
 
       this.toastService.badRequest('Processo não encontrado')
@@ -486,8 +487,6 @@ export class DespachoPrPage implements OnInit {
          
       }
 
-      console.log('alert ...'+ JSON.stringify(res))
-
     }))
 
   }

src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html

@@ -70,16 +70,16 @@
 
     </div>
 
-    <app-task-details class="content d-flex flex-column"
-    [task]="task"
-    [intervenientes]="intervenientes"
-    [cc]="cc"
-    [customDate]="customDate"
-    [fulltask]="fulltask"
-    (openOptions)="openOptions($event)"
-    (goBack)="goBack()"
-    (viewDocument)="viewDocument($event)"
-  ></app-task-details>
+    <!-- <app-task-details class="content d-flex flex-column"
+      [task]="task"
+      [intervenientes]="intervenientes"
+      [cc]="cc"
+      [customDate]="customDate"
+      [fulltask]="fulltask"
+      (openOptions)="openOptions($event)"
+      (goBack)="goBack()"
+      (viewDocument)="viewDocument($event)"
+    > </app-task-details> -->
 
 
 
@@ -88,7 +88,7 @@
         <button (click)="openAddNoteModal('Executado')" class="btn-cancel" shape="round" >Executado</button>
         <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
         <div class="solid"></div>
-        <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
+        <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
         <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
         <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
         <div class="solid"></div>
@@ -98,7 +98,7 @@
         <button (click)="openAddNoteModal('Executado')" class="btn-cancel" shape="round" >Executado</button>
         <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
         <div class="solid"></div>
-        <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
+        <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
         <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
         <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
         <div class="solid"></div>
@@ -107,7 +107,7 @@
       <div class="buttons" *ngIf="task.activityInstanceName == 'Concluir Despacho'">
         <button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
         <div class="solid"></div>
-        <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
+        <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
         <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
         <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
         <div class="solid"></div>

src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts

@@ -239,7 +239,7 @@ export class DespachoPage implements OnInit {
 
     this.despachoService.sendExpedienteToPending(this.serialnumber).subscribe(res=>{
       this.goBack();
-      this.toastService.successMessage('Processo enviado para despacho')
+      this.toastService.successMessage()
     },
     error => {
       this.toastService.badRequest("Processo não enviado para despacho")

src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts

@@ -1,7 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { Router } from '@angular/router';
-import { ModalController, NavParams } from '@ionic/angular';
-import { ProcessesService } from 'src/app/services/processes.service';
+import { ModalController } from '@ionic/angular';
 
 @Component({
   selector: 'app-discart-expedient-modal',
@@ -9,23 +7,22 @@ import { ProcessesService } from 'src/app/services/processes.service';
   styleUrls: ['./discart-expedient-modal.page.scss'],
 })
 export class DiscartExpedientModalPage implements OnInit {
+
   serialNumber:string;
   folderId:string;
   action:string;
+  
   constructor(
-    private modalController: ModalController,
-    private processes:ProcessesService,
-    private router:Router,
-  ) { 
-   }
+    private modalController: ModalController
+  ) { }
 
-  ngOnInit() {
-  }
-  close(){
+  ngOnInit() {}
+
+  close() {
     this.modalController.dismiss('No');
   }
   
-  save(){
+  save() {
     this.modalController.dismiss('Yes');
   }
 

src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html

@@ -124,6 +124,6 @@
   <div class="buttons width-100">
     <button class="btn-cancel cursor-pointer" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Adicionar Nota</button>
     <button class="btn-no-color cursor-pointer" shape="round" (click)="openMenu()"> <ion-icon name="ellipsis-vertical-outline"></ion-icon></button>
-    <button class="btn-ok cursor-pointer" shape="round" (click)="approveTask(loadedEvent.serialNumber)">Aprovar</button>
+    <button class="btn-cancel cursor-pointer" shape="round" (click)="approveTask(loadedEvent.serialNumber)">Aprovar</button>
   </div>
 </ion-footer>

src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html

@@ -93,13 +93,13 @@
         <div class="option-desc"> <div>Solicitar revisão</div> </div>
         <button (click)="openAddNoteModal('Revisão')" class="btn-cancel" shape="round" >Mandar para Revisão</button>
         <div class="option-desc"> <div>Outras opções</div> </div>
-        <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
+        <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
         <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
         <button (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
         <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
         <button *ngIf="!p.userRole(['PR'])" (click)="attachDocument()" class="btn-cancel" shape="round" >Anexar Documentos</button>
         <button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Descartar</button>
-        <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" full class="btn-ok" shape="round"  >Enviar para pendentes</button>
+        <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" full class="btn-cancel" shape="round"  >Enviar para pendentes</button>
         <div class="solid"></div>
       </div>
     </div>
@@ -107,7 +107,7 @@
     <div *ngIf="task && p.userRole(['PR'])" class="aside-right flex-column height-100 overflow-y-auto">
 
       <div class="buttons">
-        <button (click)="openExpedientActionsModal('0', fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
+        <button (click)="openExpedientActionsModal('0', fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
         <button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Descartar</button>
         <div class="solid"></div>
         <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>

src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html

@@ -116,7 +116,7 @@
         <button (click)="attachDocument()" class="btn-cancel" shape="round" >Anexar Documento <br />(Gestão Documental)</button>
       </div>
       <div *ngIf="loggeduser.Profile =='PR' " class="buttons">
-        <button (click)="openExpedientActionsModal('0', fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
+        <button (click)="openExpedientActionsModal('0', fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
         <button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Descartar</button>
         <div class="solid"></div>
         <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>

src/app/pages/gabinete-digital/gabinete-digital.page.scss

@@ -4,7 +4,6 @@ ion-content{
   --padding-start:15px; */
  /*  --padding-bottom:15px; */
   /* --background:#ecf8ff; */
-  --background: #ecf8ff;
 }
 ion-segment{
   overflow: auto;
@@ -121,6 +120,8 @@ ion-segment-button{
   background:#ecf8ff;
   overflow:hidden;
   padding: 0 !important;
+  border-top-left-radius: 25px;
+  border-top-right-radius: 25px;
 
   .aside-wrapper{
     overflow: hidden;

src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html

@@ -84,8 +84,8 @@
           <button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
           <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
           <div class="solid"></div>
-          <button *ngIf="p.userRole(['MDGPR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
-          <button *ngIf="p.userRole(['PR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
+          <button *ngIf="p.userRole(['MDGPR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
+          <button *ngIf="p.userRole(['PR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
           <button *ngIf="loggeduser.Profile == 'MDGPR'" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
           <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
           <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
@@ -94,8 +94,8 @@
           <button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
           <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
           <div class="solid"></div>
-          <button *ngIf="p.userRole(['MDGPR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
-          <button *ngIf="p.userRole(['PR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
+          <button *ngIf="p.userRole(['MDGPR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
+          <button *ngIf="p.userRole(['PR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
           <button *ngIf="loggeduser.Profile == 'MDGPR'" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
           <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
           <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
@@ -104,8 +104,8 @@
           <button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
           <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
           <div class="solid"></div>
-          <button *ngIf="p.userRole(['MDGPR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
-          <button *ngIf="p.userRole(['PR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
+          <button *ngIf="p.userRole(['MDGPR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
+          <button *ngIf="p.userRole(['PR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
           <button hidden (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
           <button (click)="openAddNoteModal('Solicitar Reapreciação')" class="btn-cancel" shape="round" >Solicitar Reapreciação</button>
           <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
@@ -121,8 +121,8 @@
         </div>
         <div class="buttons" *ngIf="task.activityInstanceName == 'Concluir Parecer'">
           <button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
-          <button *ngIf="p.userRole(['MDGPR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
-          <button *ngIf="p.userRole(['PR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
+          <button *ngIf="p.userRole(['MDGPR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
+          <button *ngIf="p.userRole(['PR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
           <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
           <button *ngIf="loggeduser.Profile == 'MDGPR'" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
           <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>

src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts

@@ -212,7 +212,7 @@ export class PedidoPage implements OnInit {
         this.goBack()       
       }
 
-      alert(JSON.stringify(res)+' nada')
+      // alert(JSON.stringify(res)+' nada')
 
     }))
   }

src/app/pages/publications/new-publication/new-publication.page.html

@@ -42,6 +42,20 @@
     </ion-thumbnail> -->
   </div>
 
+  <div class="picture d-flex pb-5 hide-desktop" *ngIf="publication.FileBase64  && capturedImage ==''">
+    <div  class="post-img">
+      <img src="{{publication.FileBase64}}" alt="image" >
+    </div>
+    <div class="d-flex flex-column pl-10"> 
+      <div class="picture-file-name">{{publication.OriginalFileName}}.{{publication.FileExtension}}</div>
+      <div class="size">75 Kb</div>
+    </div>
+    <div class="flex-grow-1 d-flex align-center justify-end">
+      <div style="color: red;">X</div>
+    </div>
+    
+  </div>
+  
   <div class="ion-item-container-no-border">
     <ion-label (click)="takePicture()">
       <div class="attach-icon">
@@ -54,7 +68,7 @@
   </div>
 
   <div class="ion-item-container-no-border">
-    <ion-label (click)="getPicture()">
+    <ion-label (click)="laodPicture()">
       <div class="attach-icon">
         <ion-icon src="assets/images/icons-add-photos.svg"></ion-icon>
       </div>
@@ -63,7 +77,7 @@
       </div> 
     </ion-label>
   </div>
-</div>
+  </div>
 
 </ion-content>
 

src/app/pages/publications/new-publication/new-publication.page.scss

@@ -134,4 +134,32 @@ font-size: 25px;
   line-height: normal;
   letter-spacing: normal;
   color: #000;
-  }
+  }
+
+
+
+
+  
+
+.picture{
+  .post-img{
+    width: 60px;
+  }
+  .picture-file-name{
+    font-size: 15px;
+    color: #0d89d1;
+  }
+  .size{
+    color: #cecece;
+    font-size: 13px;
+  }
+}
+
+.container-title{
+  font-size: 15px;
+  font-weight: bold;
+}
+.hide-desktop{
+  display: block;
+}
+

src/app/pages/publications/new-publication/new-publication.page.ts

@@ -15,6 +15,8 @@ import { ToastService } from 'src/app/services/toast.service';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { ThemePalette } from '@angular/material/core';
 import { formatDate } from 'src/plugin/momentG.js'
+import { FileLoaderService } from 'src/app/services/file/file-loader.service';
+import { FileToBase64Service } from 'src/app/services/file/file-to-base64.service';
 
 @Component({
   selector: 'app-new-publication',
@@ -66,6 +68,8 @@ export class NewPublicationPage implements OnInit {
     private publications: PublicationsService,
     private camera: Camera,
     private toastService: ToastService,
+    private fileLoaderService: FileLoaderService,
+    private fileToBase64Service: FileToBase64Service
     ) {
       
       this.publicationType = this.navParams.get('publicationType');
@@ -100,6 +104,22 @@ export class NewPublicationPage implements OnInit {
     });
   }
 
+
+  laodPicture() {
+    const input = this.fileLoaderService.createInput({
+      accept: ['image/apng', 'image/jpeg', 'image/png']
+    })
+    
+    input.onchange = async () => {
+      const file = this.fileLoaderService.getFirstFile(input)
+
+      const imageData =  await this.fileToBase64Service.convert(file)
+      this.capturedImage = imageData;
+      this.capturedImageTitle = file.name
+    };
+
+  }
+
   getPicture() {
     const options: CameraOptions = {
       quality: 90,

src/app/pages/publications/publications.page.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { Router, NavigationEnd } from '@angular/router';
-import { ModalController, PopoverController } from '@ionic/angular';
+import { ModalController } from '@ionic/angular';
 import { PublicationFolder } from 'src/app/models/publicationfolder';
 import { PublicationsService } from 'src/app/services/publications.service';
 import { NewActionPage } from './new-action/new-action.page';

src/app/pages/publications/view-publications/view-publications.page.ts

@@ -3,6 +3,7 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { ModalController } from '@ionic/angular';
 import { Publication } from 'src/app/models/publication';
 import { PublicationFolder } from 'src/app/models/publicationfolder';
+import { PublicationPipe } from 'src/app/pipes/publication.pipe';
 import { PublicationsService } from 'src/app/services/publications.service';
 import { PublicationEventFolderStorage } from 'src/app/store/publication-event-folder.service';
 import { PublicationListStorage } from 'src/app/store/publication-list.service';
@@ -29,12 +30,13 @@ export class ViewPublicationsPage implements OnInit {
   publicationEventFolderStorage = PublicationEventFolderStorage
   publicationTravelFolderService = PublicationTravelFolderStore
 
+  publicationPipe = new PublicationPipe()
+
   constructor(
     private modalController: ModalController,
     private publications: PublicationsService,
     private activatedRoute: ActivatedRoute,
-    private router: Router )
-    {
+    private router: Router) {
 
     this.item = new PublicationFolder();
     this.activatedRoute.paramMap.subscribe(params => {
@@ -55,9 +57,10 @@ export class ViewPublicationsPage implements OnInit {
     }
 
     this.getPublicationDetail();
-    setTimeout(() => {
-    this.getPublications();
-  }, 3000);
+      setTimeout(() => {
+      this.getPublications();
+    }, 3000);
+
   }
 
   ngOnChanges() {
@@ -101,35 +104,15 @@ export class ViewPublicationsPage implements OnInit {
     this.showLoader = true;
     const folderId = this.folderId
     this.publications.GetPublications(this.folderId).subscribe(res=>{
-      console.log(res);
 
-      let data = [];
 
+      this.publicationList = new Array();
+      
       res.forEach(element => {
-        let itemImage = {
-          title: 'Title',
-          url: "data:image/jpg;base64," + element.FileBase64,
-          format: 'png'
-        }
-        let item: Publication = {
-          "DateIndex": element.DateIndex,
-          "DocumentId":element.DocumentId,
-          "ProcessId":element.ProcessId,
-          "Title":element.Title,
-          "Message": element.Message,
-          "DatePublication": element.DatePublication,
-          /* image:itemImage, */
-          "FileBase64": "data:image/jpg;base64," + element.FileBase64,
-          "OriginalFileName": '',
-          "FileExtension": '',
-        }
+        let item: Publication = this.publicationPipe.itemList(element)
         this.publicationList.push(item);
-        data.push(item)
-
       });
 
-      console.log(folderId);
-
       this.publicationListStorage.add(folderId, this.publicationList)
 
       this.showLoader = false;