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

src/app/modals/create-process/create-process.page.ts

@@ -121,11 +121,11 @@ export class CreateProcessPage implements OnInit {
       let SourceType;
       let SourceSecFsId;
 
-      if(this.task.workflowInstanceDataFields.FolderID) {
+      if(this.task.workflowInstanceDataFields.FolderID || this.task.FolderId) {
         SourceId = this.task.workflowInstanceDataFields.FolderID
         SourceType =  'FOLDER'
         SourceSecFsId = 361
-      } else  {
+      } else {
         SourceId = this.task.workflowInstanceDataFields.SourceID
         SourceType =  'DOC'
         SourceSecFsId = 8
@@ -330,6 +330,8 @@ export class CreateProcessPage implements OnInit {
             try {
               await this.pedidoService.createDeferimento(this.postData).toPromise();
               await this.pedidoService.taskCompleteDeferimento({serialNumber:this.task.serialNumber}).toPromise();
+              alert('!!__!!')
+
               this.modalController.dismiss();
               this.toastService.successMessage('Pedido de Deferimento criado');
             } 
@@ -465,7 +467,11 @@ export class CreateProcessPage implements OnInit {
         },
         "AttachmentList" :null,
       }
+
+    } else {
+      alert('!!!')
     }
+    
     console.log(body);
 
     try {

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

@@ -65,7 +65,7 @@
           <ion-list>
             <h5>Documentos Anexados</h5>
             <ion-item class="ion-no-margin ion-no-padding cursor-pointer" *ngFor="let Document of fulltask.Documents">
-              <ion-label class="d-block" (click)="viewDocument(Document.DocId)">
+              <ion-label class="d-block" (click)="viewDocument()">
                 <p class="attach-title-item">{{ Document.Assunto }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
                 <p><span class="span-left">{{ Document.Sender}}</span><span class="span-right">{{ Document.DocDate | date: 'dd/MM/yyyy HH:mm' }}</span></p>
               </ion-label>

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

@@ -156,27 +156,30 @@ export class GabineteDigitalPage implements OnInit, DoCheck  {
     }
 
     const pathname = window.location.pathname
-    this.LoadCounts();
+    
 
     this.router.events.forEach((event) => {
       if(event instanceof NavigationEnd && event.url == pathname) {
-        this.checkRoutes();
-        this.LoadCounts();
-        // this.waitForDomService.selector({
-        //   selector: 'app-gabinete-digital ion-content .aside-wrapper',
-        //   callback: ()=> {
-        //     this.checkRoutes();
-        //     this.LoadCounts();
-        //   }
-        // })
-        // console.log('yes', pathname)
-      } else {
-        // console.log('not')
+
+        this.waitForDomService.selector({
+          selector: 'app-gabinete-digital ion-content .aside-wrapper',
+          callback: ()=> {
+            this.checkRoutes();
+            this.LoadCounts();
+          }
+        })
       }
     });
 
     this.hideRefreshButton();
-    this.loadAllProcesses();
+
+    this.waitForDomService.selector({
+      selector: 'app-gabinete-digital ion-content .aside-wrapper',
+      callback: ()=> {
+        this.loadAllProcesses();
+      }
+    })
+
   }
 
   async loadAllProcesses(){

src/app/services/dom/wait-for-dom.service.ts

@@ -9,7 +9,7 @@ export class WaitForDomService {
   constructor() { }
 
   selector({ selector, callback }) {
-
+    
     function _try() {
       if (!document.querySelector(selector)) {
         window.requestAnimationFrame(_try);

src/app/shared/popover/request-options/request-options.page.ts

@@ -2,12 +2,12 @@ import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { AnimationController, ModalController, NavParams, PopoverController } from '@ionic/angular';
 import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
+import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page';
 import { DarParecerPage } from 'src/app/modals/dar-parecer/dar-parecer.page';
 import { DelegarPage } from 'src/app/modals/delegar/delegar.page';
 import { PermissionService } from 'src/app/OtherService/permission.service';
 import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
 import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
-import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { ToastService } from 'src/app/services/toast.service';
 
@@ -117,21 +117,23 @@ export class RequestOptionsPage implements OnInit {
       classs = 'modal modal-desktop showAsideOptions'
     }
     const modal = await this.modalController.create({
-      component: ExpedientTaskModalPage,
+      component: CreateProcessPage,
       componentProps: {
         taskAction: taskAction,
         task: task,
         profile: this.profile,
+        fulltask: this.fulltask
       },
       cssClass: classs,
     });
     await modal.present();
-    modal.onDidDismiss().then(res=>{
+    modal.onDidDismiss().then(res=> {
       console.log(res['data']);
       if(res['data']=='openDiscart'){
         console.log('open discart');
         
         this.distartExpedientModal();
+        this.modalController.dismiss()
 
       }