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

src/app/shared/gabinete-digital/despachos/despachos.page.html

@@ -17,7 +17,6 @@
       refreshingSpinner="circles"
       refreshingText="A actualizar...">
     </ion-refresher-content>
-
   </ion-refresher>
 
   <app-task-list

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

@@ -10,6 +10,7 @@
           (click)="viewTaskDetail.emit(task)"
         >
           <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
+
           <div class="item width-100">
             <div class="exp-top-detail">
               <div class="subject">

src/app/shared/gabinete-digital/pendentes/pendentes.page.ts

@@ -80,6 +80,9 @@ export class PendentesPage implements OnInit {
   }
 
   async viewTaskDetails({ SerialNumber, WorkflowName, activityInstanceName }:customTask) {
+
+    console.log(SerialNumber, WorkflowName, activityInstanceName)
+
     if(WorkflowName == 'Despacho') {
       this.router.navigate(['/home/gabinete-digital/despachos',SerialNumber,'gabinete-digital']);
     }

src/app/shared/popover/despachos-options/despachos-options.page.html

@@ -9,7 +9,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)="openTaskProcessModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
+    <button (click)="openTaskProcessModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
     <button (click)="openTaskProcessModal('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>
@@ -19,7 +19,7 @@
     <button (click)="openAddNoteModal('Executado')" class="btn-cancel" shape="round" >Executado</button>
     <button (click)="openDelegarModal(task)" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Delegar</button>
     <div class="solid"></div>
-    <button (click)="openTaskProcessModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
+    <button (click)="openTaskProcessModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
     <button (click)="openTaskProcessModal('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>
@@ -28,7 +28,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)="openTaskProcessModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
+    <button (click)="openTaskProcessModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
     <button (click)="openTaskProcessModal('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/shared/popover/despachos-options/despachos-options.page.ts

@@ -62,7 +62,7 @@ export class DespachosOptionsPage implements OnInit {
       cssClass: classs,
     });
     await modal.present();
-    modal.onDidDismiss().then(res=>{
+    modal.onDidDismiss().then( res => {
       this.goBack();
     });
   }
@@ -70,6 +70,7 @@ export class DespachosOptionsPage implements OnInit {
   sendExpedienteToPending(){
     this.popoverController.dismiss();
     this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{
+      this.toastService.successMessage()
       console.log(res);
       this.close();
     },()=>{

src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.html

@@ -13,13 +13,13 @@
         <button class="btn-cancel desk" shape="round"> Reencaminhar para Área jurídica </button>
         <button (click)="openAddNoteModal('Gerar Diploma')" class="btn-cancel" shape="round" >Gerar Diploma</button>
         <button class="btn-cancel desk" shape="round"> Outras opções </button>
-        <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>
       </div>
       <div class="flex-grow-1 width-50 pl-10">
         <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)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</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>
     </div>
     <div *ngIf="task && p.userRole(['PR'])" class="d-flex width-100">

src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts

@@ -97,7 +97,8 @@ export class DespachosPrOptionsPage implements OnInit {
   sendExpedienteToPending() {
     this.processes.SetTaskToPending(this.serialNumber).subscribe(res=>{
       console.log(res);
-      this.close();
+      this.toastService.successMessage()
+      this.popoverController.dismiss('close')
     },()=>{
 
       this.toastService.badRequest('Processo não encontrado')

src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.html

@@ -11,14 +11,14 @@
       <button (click)="openAddNoteModal('Aprovar')" class="btn-cancel" shape="round" >Aprovar</button>
       <button (click)="openAddNoteModal('Revisão')" class="btn-cancel" shape="round" >Mandar para Revisão</button>
       <div class="solid"></div>
-      <button (click)="distartExpedientModal('descartar')" full class="btn-ok" shape="round" >Descartar</button>
+      <button (click)="distartExpedientModal('descartar')" full class="btn-cancel" shape="round" >Descartar</button>
       <div hidden class="solid"></div>
       <button hidden class="btn-cancel" shape="round" >Delegar</button>
       <button (click)="attachDocument()" class="btn-cancel" shape="round" >Anexar Documento</button>
     </div>
     <div *ngIf="loggeduser.Profile =='PR' " class="buttons">
-      <button (click)="openExpedientActionsModal('0', fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
-      <button (click)="distartExpedientModal('descartar')" full class="btn-ok" shape="round" >Descartar</button>
+      <button (click)="openExpedientActionsModal('0', fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
+      <button (click)="distartExpedientModal('descartar')" full class="btn-cancel" shape="round" >Descartar</button>
       <div class="solid"></div>
       <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>

src/app/shared/popover/opts-expediente/opts-expediente.page.html

@@ -12,7 +12,7 @@
         <button class="btn-cancel desk" shape="round"> Solicitar revisão </button>
         <button (click)="openAddNoteModal('Revisão')" class="btn-cancel" shape="round" >Mandar para Revisão</button>
         <button class="btn-cancel desk" shape="round">Outras opções </button>
-        <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>
       </div>
       <div class="flex-grow-1">
         <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
@@ -20,12 +20,12 @@
         <button (click)="openBookMeetingModal()" 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>
     </div>
     <div *ngIf="task && p.userRole(['PR'])" class="d-flex width-100">
       <div class="flex-grow-1">
-        <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/shared/popover/request-options/request-options.page.html

@@ -10,8 +10,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(['PR'])" (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(['PR'])" (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('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>
@@ -20,8 +20,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(['PR'])" (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(['PR'])" (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('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>
@@ -30,8 +30,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(['PR'])" (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(['PR'])" (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 (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>
@@ -48,8 +48,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(['PR'])" (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(['PR'])" (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 (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/shared/popover/request-options/request-options.page.ts

@@ -31,7 +31,6 @@ export class RequestOptionsPage implements OnInit {
     private navParams: NavParams,
     private processes: ProcessesService,
     private activatedRoute: ActivatedRoute,
-    private animationController: AnimationController,
     private toastService: ToastService,
     private router: Router,
     public p: PermissionService,
@@ -72,18 +71,13 @@ export class RequestOptionsPage implements OnInit {
   }
 
   close() {
-    if( window.innerWidth < 801) {
-      this.modalController.dismiss('close');
-    } else {
-      this.modalController.dismiss('close');
-    }
-
-    // this.router.navigate(['/home/gabinete-digital/pedidos']);
+    this.popoverController.dismiss('close')
   }
 
   sendExpedienteToPending() {
     this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{
       console.log(res);
+      this.toastService.successMessage()
       this.close();
     },()=>{
 

src/app/shared/popover/searched-document-options/searched-document-options.page.html

@@ -1,7 +1,7 @@
 <ion-content class="container width-100 ">
   <div class="buttons">
-    <button *ngIf="p.userRole(['PR'])" (click)="openExpedientActionsModal('0')" class="btn-ok" shape="round" >Efetuar Despacho</button>
-    <button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('0')" class="btn-ok" shape="round" >Efetuar Despacho</button>
+    <button *ngIf="p.userRole(['PR'])" (click)="openExpedientActionsModal('0')" class="btn-cancel" shape="round" >Efetuar Despacho</button>
+    <button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('0')" class="btn-cancel" shape="round" >Efetuar Despacho</button>
     <div class="solid"></div>
     <button (click)="openExpedientActionsModal('0')"  class="btn-cancel" shape="round" >Solicitar Parecer</button>
     <button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('2')" class="btn-cancel" shape="round" >Pedido de Deferimento</button>

src/app/shared/publication/new-action/new-action.page.html

@@ -31,13 +31,12 @@
         </div>
         <div class="ion-input-class flex-grow-1">
           <ion-datetime 
-          class="d-block d-md-none"
+            class="d-block d-md-none"
             [(ngModel)]="folder.DateBegin"
             placeholder="Início"
             displayFormat="D MMM YYYY H:mm"
             minuteValues="0,15,30,45"
             monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
-            min="{{minDate}}" 
             max="2025">
           </ion-datetime>
 
@@ -46,7 +45,6 @@
             <input matInput [ngxMatDatetimePicker]="picker1" 
               placeholder="Choose a date*" 
               [(ngModel)]="folder.DateBegin"
-              [min]="minDate"
               [disabled]="disabled"
             >
             <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
@@ -76,7 +74,6 @@
             displayFormat="D MMM YYYY H:mm"
             minuteValues="0,15,30,45"
             monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
-            min="{{minDate}}" 
             max="2025">
           </ion-datetime>
 
@@ -84,7 +81,6 @@
             <input matInput [ngxMatDatetimePicker]="picker2" 
               placeholder="Choose a date*" 
               [(ngModel)]="folder.DateEnd"
-              [min]="minDate"
               [disabled]="disabled"
             >
             <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker2"></mat-datepicker-toggle>

src/app/shared/publication/new-action/new-action.page.ts

@@ -24,8 +24,6 @@ export class NewActionPage implements OnInit {
   public showSeconds = false;
   public touchUi = false;
   public enableMeridian = false;
-  public minDate = new Date().toISOString().slice(0,10)
-  public maxDate: any;
   public stepHour = 1;
   public stepMinute = 5;
   public stepSecond = 5;

src/app/shared/publication/new-publication/new-publication.page.html

@@ -16,7 +16,7 @@
     <ion-input [(ngModel)]="pub.Title" name="title" placeholder="Título" ></ion-input>
   </div>
 
-  <div *ngIf="publicationType!='1'" class="container-div pb-20">
+  <div *ngIf="publicationType!='1' " class="container-div pb-20">
     <div class="ion-item-class-2 d-flex">
       <div class="ion-icon-class" >
         <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
@@ -29,7 +29,7 @@
   
   <div class="container-title py-10 hide-desktop">Fotografia Anexada</div>
 
-  <div class="picture d-flex pb-5 hide-desktop" *ngIf="publication.FileBase64">
+  <div class="picture d-flex pb-5 hide-desktop" *ngIf="publication.FileBase64  && capturedImage ==''">
     <div  class="post-img">
       <img src="{{publication.FileBase64}}" alt="image" >
     </div>
@@ -43,26 +43,32 @@
     
   </div>
 
-  <!-- <div *ngIf="capturedImage != ''" class="ion-item-container-no-border hide-desktop">
+  <div class="ion-item-container-no-border">
+    <ion-label (click)="laodPicture()">
+      <div class="attach-icon">
+        <ion-icon src="assets/images/icons-add-photos.svg"></ion-icon>
+      </div>
+      <div class="attach-document">
+        <ion-label>Anexar Fotografia</ion-label>
+      </div> 
+    </ion-label>
+  </div>
+
+  <div *ngIf="capturedImage != ''" class="ion-item-container-no-border">
     <ion-label class="attached-title">Fotografia Anexada</ion-label>
     <ion-item lines="none">
       <ion-thumbnail slot="start">
-        <ion-img [(ngModel)]="capturedImage" name="image" ngDefaultControl [src]="'data:image/png;base64,'+capturedImage"></ion-img>
-      </ion-thumbnail> -->
-    <!--  <ion-thumbnail *ngIf="!publication" slot="start">
-        <ion-img [(ngModel)]="publication.imageUrl" [src]="guestPicture"></ion-img>
-      </ion-thumbnail> -->
-      <!-- <ion-label>
+        <ion-img [(ngModel)]="capturedImage" name="image" ngDefaultControl [src]="capturedImage"></ion-img>
+      </ion-thumbnail>
+
+      <ion-label>
         <p>{{capturedImageTitle}}</p>
         <p hidden>size</p>
       </ion-label>
       <ion-icon (click)="clear()" name="close"></ion-icon>
-    </ion-item> -->
+    </ion-item>
     
-    <!-- <ion-thumbnail>
-      <ion-img src="{{imgUrl}}"></ion-img>
-    </ion-thumbnail> -->
-  <!-- </div> -->
+  </div>
 
   <div class="ion-item-container-no-border hide-desktop">
     <ion-label (click)="takePicture()">

src/app/shared/publication/new-publication/new-publication.page.ts

@@ -8,7 +8,8 @@ import { PhotoService } from 'src/app/services/photo.service';
 import { Camera, CameraOptions } from '@ionic-native/camera/ngx';
 import { ToastService } from 'src/app/services/toast.service';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
-
+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',
   templateUrl: './new-publication.page.html',
@@ -45,15 +46,15 @@ export class NewPublicationPage implements OnInit {
   capturedImageTitle:any;
 
   constructor(
-    private modalController: ModalController,
     public photoService: PhotoService,
     private publications: PublicationsService,
     private camera: Camera,
-    private animationController: AnimationController,
     private toastService: ToastService,
-    ) {
-      this.publicationTitle = 'Nova Publicação';
-    }
+    private fileLoaderService: FileLoaderService,
+    private fileToBase64Service: FileToBase64Service
+  ) {
+    this.publicationTitle = 'Nova Publicação';
+  }
 
   ngOnInit() {
     if(this.publicationType == '3'){
@@ -88,7 +89,7 @@ export class NewPublicationPage implements OnInit {
   }
 
 
-  takePicture(){
+  takePicture() {
     const options: CameraOptions = {
       quality: 90,
       destinationType: this.camera.DestinationType.DATA_URL,
@@ -99,9 +100,7 @@ export class NewPublicationPage implements OnInit {
     }
 
     this.camera.getPicture(options).then((imageData) => {
-     // imageData is either a base64 encoded string or a file URI
-     // If it's base64 (DATA_URL):
-     let base64Image = 'data:image/jpeg;base64,' + imageData;
+
      this.capturedImage = imageData;
      this.capturedImageTitle = new Date().getTime() + '.jpeg';
     }, (err) => {
@@ -109,27 +108,20 @@ export class NewPublicationPage implements OnInit {
     });
   }
 
-  getPicture(){
-    const options: CameraOptions = {
-      quality: 90,
-      sourceType: this.camera.PictureSourceType.PHOTOLIBRARY,
-      destinationType: this.camera.DestinationType.DATA_URL,
-      encodingType: this.camera.EncodingType.JPEG,
-      mediaType: this.camera.MediaType.PICTURE,
-      targetWidth: 720,
-      targetHeight: 720,
-    }
-    this.camera.getPicture(options).then((imageData) => {
-      // imageData is either a base64 encoded string or a file URI
-      // If it's base64 (DATA_URL):
-      let base64Image = 'data:image/jpeg;base64,' + imageData;
-      this.capturedImage = imageData;
-      this.capturedImageTitle = new Date().getTime() + '.jpeg';
-     }, (err) => {
-      console.log(err);
-     });
-  }
+  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
+    };
+
+  }
 
 
   runValidation() {
@@ -190,7 +182,7 @@ export class NewPublicationPage implements OnInit {
         }
 
       }
-      else if (!this.publication.OriginalFileName) {
+      else if (!this.publication.OriginalFileName) { //
         this.publication = {
           DateIndex: this.publication.DateIndex,
           DocumentId:this.publication.DocumentId,
@@ -198,6 +190,7 @@ export class NewPublicationPage implements OnInit {
           Title: this.pub.Title,
           Message: this.pub.Message,
           DatePublication: this.publication.DatePublication,
+          OriginalFileName: this.capturedImageTitle,
           // OriginalFileName: this.publication.OriginalFileName,
           // FileBase64: this.publication.FileBase64,
           // FileExtension: 'jpeg',
@@ -286,10 +279,10 @@ export class NewPublicationPage implements OnInit {
     this.capturedImage = '';
   }
   setTitle(){
-    if(this.publicationType == '1'){
+    if(this.publicationType == '1') {
       this.publicationTitle = 'Nova Publicação Rápida';
     }
-    else if(this.publicationType == '2'){
+    else if(this.publicationType == '2') {
       this.publicationTitle = 'Nova Publicação';
     }
     else if(this.publicationType == '3') {
@@ -309,33 +302,4 @@ export class NewPublicationPage implements OnInit {
    
   }
 
-  /* async openGallery() {
-    const modal = await this.modalController.create({
-      component: GalleryPage,
-      componentProps:{
-      },
-      cssClass: 'new-publication',
-      backdropDismiss: false
-    });
-    await modal.present();
-    modal.onDidDismiss();
-  } */
-
-   /* async takePicture(){
-    const image = await Plugins.Camera.getPhoto({
-      quality: 100,
-      allowEditing: false,
-      resultType: CameraResultType.DataUrl,
-      source: CameraSource.Camera
-    });
-    console.log(image);
-    
-    this.photo = this.sanitizer.bypassSecurityTrustResourceUrl(image && (image.dataUrl));
-  } */
-
-
-
-
-
-  
 }

src/app/shared/publication/view-publications/view-publications.page.ts

@@ -9,6 +9,7 @@ import { NewPublicationPage } from 'src/app/pages/publications/new-publication/n
 import { PublicationListStorage } from 'src/app/store/publication-list.service'
 import { PublicationEventFolderStorage } from 'src/app/store/publication-event-folder.service';
 import { PublicationTravelFolderStore } from 'src/app/store/publication-travel-folder.service';
+import { PublicationPipe } from 'src/app/pipes/publication.pipe';
 @Component({
   selector: 'app-view-publications',
   templateUrl: './view-publications.page.html',
@@ -31,16 +32,17 @@ export class ViewPublicationsPage implements OnInit {
   @Output() goBacktoPublicationDetails = new EventEmitter<any>();
 
 
-
   publicationListStorage = PublicationListStorage
   //
   publicationEventFolderStorage = PublicationEventFolderStorage
   publicationTravelFolderService = PublicationTravelFolderStore
 
+  publicationPipe = new PublicationPipe()
+
   constructor(
     private loadingController: LoadingService,
     private modalController: ModalController,
-    private publications: PublicationsService,
+    private publications: PublicationsService
     ) {
       this.item = new PublicationFolder();
   }
@@ -82,38 +84,23 @@ export class ViewPublicationsPage implements OnInit {
   }
 
   getPublicationDetail() {
-    let allActions = this.publicationEventFolderStorage.list.concat(this.publicationTravelFolderService.list)
-    this.item = allActions.find((e)=> e.ProcessId == this.folderId);
+    
+    setTimeout(() => {
+      let allActions = this.publicationEventFolderStorage.list.concat(this.publicationTravelFolderService.list)
+      this.item = allActions.find((e)=> e.ProcessId == this.folderId);
+    },100);
 
   }
 
   getPublications() {
     this.showLoader = true;
-
     const folderId = this.folderId
-
     this.publications.GetPublications(folderId).subscribe(res=> {
 
       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);
       });