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

src/app/Rules/despacho.service.ts

@@ -15,6 +15,10 @@ export class DespachoService {
 
   action: "Arquivo" | "Reencaminhar"
 
+  actions: {
+    'Tarefa do Despacho': 'Tarefa de Despacho' | 'Concluir' | 'rexecucao'
+  }
+
    constructor(
     private processes: ProcessesService,
     public p: PermissionService
@@ -35,20 +39,20 @@ export class DespachoService {
     return this.processes.CompleteTask(body)
   }
   
-  reencaminhar(note:string, documents:any, serialnumber) {
+  // reencaminhar(note:string, documents:any, serialnumber) {
 
-    let body = {
-      "serialNumber": serialnumber,
-      "action": "Reencaminhar",
-      "ActionTypeId": 98,
-      "dataFields": {
-        "ReviewUserComment": note,
-      },
-      "AttachmentList" :documents,
-    }
+  //   let body = {
+  //     "serialNumber": serialnumber,
+  //     "action": "Reencaminhar",
+  //     "ActionTypeId": 98,
+  //     "dataFields": {
+  //       "ReviewUserComment": note,
+  //     },
+  //     "AttachmentList" :documents,
+  //   }
     
-    return this.processes.CompleteTask(body)
-  }
+  //   return this.processes.CompleteTask(body)
+  // }
  
   executado(note:string, documents:any , serialnumber) {
     
@@ -65,6 +69,45 @@ export class DespachoService {
     return this.processes.CompleteTask(body)
   }
 
+  solicitarParecer(task) {
+    // let body = {
+    //   "serialNumber": serialnumber,
+    //   "action": "Conhecimento",
+    //   "ActionTypeId": 92,
+    //   "dataFields": {
+    //     "ReviewUserComment": note,
+    //   },
+    //   "AttachmentList" :documents,
+    // }
+  }
+
+  EfectuarDespacho(task) {
+    // let body = {
+    //   "serialNumber": serialnumber,
+    //   "action": "Conhecimento",
+    //   "ActionTypeId": 94,
+    //   "dataFields": {
+    //     "ReviewUserComment": note,
+    //   },
+    //   "AttachmentList" :documents,
+    // }
+  }
+
+
+  rexecucao({note, documents, serialnumber}) {
+    let body = {
+      "serialNumber": serialnumber,
+      "action": "Reexecução",
+      "ActionTypeId": 100000010,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList" :documents,
+    }
+
+    return this.processes.CompleteTask(body)
+  }
+
   CompleteTask({serialNumber}) {
 
     const body = {
@@ -80,12 +123,24 @@ export class DespachoService {
     return this.processes.CompleteTask(body)
   }
 
+
+  Finalizar({serialNumber}) {
+    const body = {
+      "serialNumber": serialNumber,
+      "action": "Conhecimento",
+      "ActionTypeId": 104,
+      "dataFields": {
+        "ReviewUserComment": '',
+      },
+      "AttachmentList" :null,
+    }
+  }
+
   sendExpedienteToPending(serialnumber) {
     return this.processes.SetTaskToPending(serialnumber)
   }
 
   /**
-   * 
    * @param body any
    * @returns promise
    * @description for both profile PR and MDGPR

src/app/Rules/expediente-pr.service.spec.ts

@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { ExpedientePrService } from './expediente-pr.service';
+
+describe('ExpedientePrService', () => {
+  let service: ExpedientePrService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(ExpedientePrService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});

src/app/Rules/expediente-pr.service.ts

@@ -0,0 +1,9 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ExpedientePrService {
+
+  constructor() { }
+}

src/app/Rules/expediente.service.spec.ts

@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { ExpedienteService } from './expediente.service';
+
+describe('ExpedienteService', () => {
+  let service: ExpedienteService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(ExpedienteService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});

src/app/Rules/expediente.service.ts

@@ -0,0 +1,9 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ExpedienteService {
+
+  constructor() { }
+}

src/app/Rules/pedido.service.spec.ts

@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { PedidoService } from './pedido.service';
+
+describe('PedidoService', () => {
+  let service: PedidoService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(PedidoService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});

src/app/Rules/pedido.service.ts

@@ -0,0 +1,61 @@
+import { Injectable } from '@angular/core';
+import { PermissionService } from '../OtherService/permission.service';
+import { ProcessesService } from '../services/processes.service';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class PedidoService {
+
+  constructor(
+    private processes: ProcessesService,
+    public p: PermissionService
+  ) { }
+
+  createParecer(body: any) {
+    if(this.p.userRole(['PR'])) {
+      return this.processes.postParecerPr(body)
+    } else {
+      return this.processes.postParecer(body)
+    }
+  }
+
+  createDeferimento(body: any) {
+
+    if(this.p.userRole(['PR'])) { 
+      throw('PR cant create Deferimento')
+    }
+    
+    return this.processes.postDeferimento(body)
+  }
+
+  taskCompleteParecer({serialNumber}) {
+    const body = {
+      "serialNumber": serialNumber,
+      "action": "Parecer",
+      "ActionTypeId": 92, // Pedido de parece
+      "dataFields": {
+        "ReviewUserComment": '',
+      },
+      "AttachmentList" :null,
+    }
+    return this.processes.CompleteTask(body)
+  }
+
+  taskCompleteDeferimento({serialNumber}) {
+
+    const body = {
+      "serialNumber": serialNumber,
+      "action": "Parecer",
+      "ActionTypeId": 93, // Pedido de deferimento
+      "dataFields": {
+        "ReviewUserComment": '',
+      },
+      "AttachmentList" :null,
+    }
+    return this.processes.CompleteTask(body)
+  }
+
+
+
+}

src/app/Rules/pendentes.service.spec.ts

@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { PendentesService } from './pendentes.service';
+
+describe('PendentesService', () => {
+  let service: PendentesService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(PendentesService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});

src/app/Rules/pendentes.service.ts

@@ -0,0 +1,9 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class PendentesService {
+
+  constructor() { }
+}

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

@@ -19,7 +19,7 @@ import { NgxMatDateFormats } from '@angular-material-components/datetime-picker'
 import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';
 import { PermissionService } from 'src/app/OtherService/permission.service';
 import { DespachoService } from 'src/app/Rules/despacho.service';
-
+import { PedidoService } from 'src/app/Rules/pedido.service'
 
 const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
   parse: {
@@ -94,7 +94,8 @@ export class CreateProcessPage implements OnInit {
     private animationController: AnimationController,
     private toastService: ToastService,
     public p: PermissionService,
-    private despachoService: DespachoService
+    private despachoService: DespachoService,
+    private pedidoService: PedidoService
     ) {
       this.loggeduser = userAuth.ValidatedUser;
       this.task = this.navParams.get('task');
@@ -163,9 +164,9 @@ export class CreateProcessPage implements OnInit {
       this.subjectTypes = res;
     });
   }
+
   cancelTask() {
     this.modalController.dismiss(null);
-
   }
 
   runValidation() {
@@ -263,7 +264,7 @@ export class CreateProcessPage implements OnInit {
             }
 
             break;
-          case '1':
+          case '1': // pedido de Parecer
             this.postData = {
               DistributionType: "Paralelo",
               CountryCode: 'AO',
@@ -275,16 +276,19 @@ export class CreateProcessPage implements OnInit {
             console.log(this.postData);
 
             try {
-              await this.processes.postParecer(this.postData).toPromise();
-              await this.FinalizarParecer(loader, 'Pedido de Parecer enviado');
+              await this.pedidoService.createParecer(this.postData).toPromise();
+              await this.pedidoService.taskCompleteParecer({serialNumber:this.task.serialNumber}).toPromise();
+              this.modalController.dismiss();
+              this.toastService.successMessage('Pedido de Parecer enviado');
             }
             catch (error) {
               this.toastService.badRequest('Processo não efectuado');
+            } finally {
               loader.remove()
             }
 
             break;
-          case '2':
+          case '2': // Pedido de Deferimento
             this.postData = {
               DistributionType: "Paralelo",
               CountryCode: 'AO',
@@ -296,11 +300,15 @@ export class CreateProcessPage implements OnInit {
             console.log(this.postData);
 
             try {
-              await this.processes.postDeferimento(this.postData).toPromise();
-              await this.FinalizarDeferimento(loader, 'Pedido de deferimento enviado');
+              await this.pedidoService.createDeferimento(this.postData).toPromise();
+              await this.pedidoService.taskCompleteDeferimento({serialNumber:this.task.serialNumber}).toPromise();
+              this.modalController.dismiss();
+              this.toastService.successMessage('Pedido de Deferimento criado');
             } 
             catch (error) {
               this.toastService.badRequest('Processo não efectuado');
+            }
+            finally {
               loader.remove()
             }
             break;
@@ -310,7 +318,7 @@ export class CreateProcessPage implements OnInit {
 
       case 'PR':
           switch (this.taskType) {
-            case '0':
+            case '0': // Despacho PR
               this.postData = {
                 DistributionType: "Paralelo",
                 CountryCode: 'AO',
@@ -333,7 +341,7 @@ export class CreateProcessPage implements OnInit {
               }
 
               break;
-            case '1':
+            case '1': // Pedido de Parecer
               this.postData = {
                 DistributionType: "Paralelo",
                 CountryCode: 'AO',
@@ -345,17 +353,19 @@ export class CreateProcessPage implements OnInit {
               console.log(this.postData);
 
               try {
-                await this.processes.postParecer(this.postData).toPromise();
-                await this.executado(loader);
+                await this.pedidoService.createParecer(this.postData).toPromise();
+                await this.pedidoService.taskCompleteParecer({serialNumber:this.task.serialNumber}).toPromise();
+                this.modalController.dismiss();
                 this.toastService.successMessage('Pedido de Parecer criado');
               }
               catch (error) {
-                loader.remove()
                 this.toastService.badRequest('Processo não efectuado');
+              } finally {
+                loader.remove()
               }
 
               break;
-            case '2':
+            case '2': // Pedido de Deferimento
                 this.postData = {
                   DistributionType: "Paralelo",
                   CountryCode: 'AO',
@@ -367,13 +377,15 @@ export class CreateProcessPage implements OnInit {
                 console.log(this.postData);
 
                 try {
-                  await this.processes.postDeferimento(this.postData).toPromise();
-                  await this.executado(loader);
+                  await this.pedidoService.createDeferimento(this.postData).toPromise();
+                  await this.pedidoService.taskCompleteDeferimento({serialNumber:this.task.serialNumber}).toPromise();
+                  this.modalController.dismiss();
                   this.toastService.successMessage('Pedido de Deferimento criado');
                 }
                 catch (error) {
-                  loader.remove()
                   this.toastService.badRequest('Processo não efectuado');
+                } finally {
+                  loader.remove()
                 }
 
                 break;
@@ -383,55 +395,6 @@ export class CreateProcessPage implements OnInit {
 
   }
 
-  async executado(loader:HTMLDivElement, message?) {
-
-    let body;
-
-    if(this.task.activityInstanceName =='Tarefa de Despacho' || this.task.activityInstanceName =='Reexecutar Despacho') {
-
-      body = {
-        "serialNumber": this.task.serialNumber,
-        "action": "Conhecimento",
-        "ActionTypeId": 104,
-        "dataFields": {
-          "ReviewUserComment": '',
-        },
-        "AttachmentList" :null,
-      }
-    }
-    else if(this.task.activityInstanceName =='Concluir Despacho' || this.task.activityInstanceName == 'Concluir Parecer') {
-
-      body = {
-        "serialNumber": this.task.serialNumber,
-        "action": "Despacho",
-        "ActionTypeId": 94,
-        "dataFields": {
-          "ReviewUserComment": '',
-        },
-        "AttachmentList" :null,
-      }
-    } else {
-      body = {
-        "serialNumber": this.task.serialNumber,
-        "action": "Despacho",
-        "ActionTypeId": 94,
-        "dataFields": {
-          "ReviewUserComment": '',
-        },
-        "AttachmentList" :null,
-      }
-    }
-
-    try {
-      await this.processes.CompleteTask(body).toPromise();
-      this.toastService.successMessage(message);
-      this.modalController.dismiss();
-    } catch (error) {
-      this.toastService.badRequest('Processo não efectuado');
-    } finally {
-      loader.remove()
-    }
-  }
 
   async FinalizarDespacho(loader: HTMLDivElement, message?) {
     
@@ -479,81 +442,6 @@ export class CreateProcessPage implements OnInit {
 
   }
 
-  async FinalizarParecer(loader: HTMLDivElement, message?) {
-    let body;
-
-    if(this.task.activityInstanceName =='Concluir Deferimento' ||
-    this.task.activityInstanceName =='Reapreciar Deferimento'
-    ){
-      body = {
-        "serialNumber": this.task.serialNumber,
-        "action": "Parecer",
-        "ActionTypeId": 92,
-        "dataFields": {
-          "ReviewUserComment": message,
-        },
-        "AttachmentList" :null,
-      }
-    }
-    else if(this.task.activityInstanceName =='Tarefa de Despacho'){
-      body = {
-        "serialNumber": this.task.serialNumber,
-        "action": "Conhecimento",
-        "ActionTypeId": 92,
-        "dataFields": {
-          "ReviewUserComment": message,
-        },
-        "AttachmentList" :null,
-      }
-    }
-    else{
-      body = {
-        "serialNumber": this.task.serialNumber,
-        "action": "Parecer",
-        "ActionTypeId": 96,
-        "dataFields": {
-          "ReviewUserComment": message,
-        },
-        "AttachmentList" :null,
-      }
-    }
-
-    try {
-      console.log(body);
-
-      await this.processes.CompleteTask(body).toPromise();
-      this.toastService.successMessage(message)
-    } catch (e) {
-      this.toastService.badRequest()
-    } finally {
-      loader.remove()
-    }
-
-  }
-
-  async FinalizarDeferimento(loader: HTMLDivElement, message?) {
-    if(this.task.activityInstanceName =='Reapreciar Deferimento') {
-      let body = { 
-        "serialNumber": this.task.serialNumber, 
-        "action": "Parecer",
-        "ActionTypeId": 92,
-        "dataFields": {
-          "ReviewUserComment": '',
-        },
-        "AttachmentList" :null,
-      }
-      try {
-        await this.processes.CompleteTask(body).toPromise();
-        this.toastService.successMessage(message)
-        
-      } catch (e) {
-        this.toastService.badRequest()
-      } finally {
-        loader.remove()
-      }
-    }
-  }
-
   async addParticipants() {
 
     this.adding = "intervenient";
@@ -666,7 +554,6 @@ export class CreateProcessPage implements OnInit {
 
   }
 
-
   dynamicSetIntervenient({taskParticipants, taskParticipantsCc}){
     this.taskParticipants = taskParticipants;
     this.taskParticipantsCc = taskParticipantsCc;

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

@@ -237,32 +237,6 @@ export class DespachoPage implements OnInit {
 
   }
 
-  async reencaminhar(note:string, documents:any) {
-    let body = {
-      "serialNumber": this.serialnumber,
-      "action": "Reencaminhar",
-      "ActionTypeId": 98,
-      "dataFields": {
-        "ReviewUserComment": note,
-      },
-      "AttachmentList" :documents,
-    }
-
-    const loader = this.toastService.loading()
-
-    try {
-      await this.processes.CompleteTask(body).toPromise()
-      this.toastService.successMessage()
-      this.close();
-    } catch (error) {
-      this.toastService.badRequest()
-    }
-    finally {
-      loader.remove()
-    }
-
-  }
-
   async reexecute(note:string, documents:any) {
     let body = {
       "serialNumber": this.serialnumber,

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

@@ -52,14 +52,24 @@ export class ExpedientePage implements OnInit {
     
   }
 
-  LoadList(){
+  async LoadList(){
     this.skeletonLoader = true
 
-    this.processes.GetTasksList("Expediente", false).subscribe(result => {
-      console.log(result);
+    try {
+      const expedientePr: object[] = await this.processes.GetTasksList("Expediente do Presidente", false).toPromise()
+      const expedienteMD: object[] = await this.processes.GetTasksList("Expediente", false).toPromise()
+  
+      const result = expedientePr.concat(expedienteMD)
+
+      console.log('result', result);
+      console.log('expedientePr', expedientePr)
+      console.log('expedienteMD', expedienteMD)
+
+      
       this.taskslist = new Array();
-      let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
-      res.forEach(element => {
+      let res = result.reverse().filter((data: any) => data.workflowInstanceDataFields.Status == "Active");
+
+      res.forEach((element: any) => {
         let date = new Date(element.taskStartDate);
         date.setMonth(date.getMonth() + 1);
         let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
@@ -80,10 +90,11 @@ export class ExpedientePage implements OnInit {
       console.log(this.taskslist);
       this.expedienteStorage.reset(this.taskslist);
       this.skeletonLoader = false;
-    }, ()=>{
+    } catch (error) {
       this.toastService.badRequest('Processo não encontrado')
       this.goBack()
-    });
+    }
+
   }
 
   async refreshing() {

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

@@ -26,6 +26,7 @@ import { SearchPage } from 'src/app/pages/search/search.page';
 import { Attachment } from 'src/app/models/attachment.model';
 import { SearchDocument } from 'src/app/models/search-document';
 import { Location } from '@angular/common';
+import { PedidoService } from 'src/app/Rules/pedido.service';
 
 @Component({
   selector: 'app-expediente-pr',
@@ -64,7 +65,7 @@ export class ExpedientePrPage implements OnInit {
     private animationController: AnimationController,
     private toastService: ToastService,
     private attachmentsService: AttachmentsService,
-    private location: Location,
+    private location: Location
 
     ) {
       this.loggeduser = userAuth.ValidatedUser;

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

@@ -1,7 +1,6 @@
 import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
 import { NavigationEnd, NavigationExtras, NavigationStart, Router } from '@angular/router';
 import { CalendarComponent } from 'ionic2-calendar';
-
 import { DailyWorkTask } from '../../../models/dailyworktask.model';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { ModalController } from '@ionic/angular';
@@ -10,6 +9,7 @@ import { AlertService } from 'src/app/services/alert.service';
 import { User } from 'src/app/models/user.model';
 import { AuthService } from 'src/app/services/auth.service';
 import { ExpedienteprStore } from 'src/app/store/expedientepr-store.service';
+import { Location } from '@angular/common'
 
 @Component({
   selector: 'app-expedientes-pr',
@@ -36,6 +36,7 @@ export class ExpedientesPrPage implements OnInit {
     private alertService: AlertService,
     private authService: AuthService,
     private router: Router,
+    private location: Location
     ) {
       this.loggeduser = authService.ValidatedUser;
     }
@@ -62,71 +63,35 @@ export class ExpedientesPrPage implements OnInit {
 
   LoadList(){
     this.skeletonLoader = true
-
-    switch (this.loggeduser.Profile) {
-      case 'MDGPR':
-        this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => {
-          console.log(result);
-          this.skeletonLoader = false
-          this.showLoader =false
-          this.taskslist = new Array();
-          let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
-          res.forEach(element => {
-            let date = new Date(element.taskStartDate);
-            date.setMonth(date.getMonth() + 1);
-            let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
-            let task: DailyWorkTask = {
-              "SerialNumber": element.serialNumber,
-              "Folio": element.workflowInstanceDataFields.Subject,
-              "Senders": element.workflowInstanceDataFields.Sender,
-              "CreateDate": taskDate,
-              "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-              "Remetente": element.workflowInstanceDataFields.Remetente,
-              "DocumentsQty": element.totalDocuments,
-              "WorkflowName": element.workflowDisplayName,
-              "activityInstanceName": element.activityInstanceName,
-              "Status": element.workflowInstanceDataFields.Status,
-              }
-              this.taskslist.push(task);
-            });
-          console.log(this.taskslist);
-          this.expedienteprstore.reset(this.taskslist);
-          this.skeletonLoader = false
+    
+    this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => {
+      console.log(result);
+      this.skeletonLoader = false
+      this.showLoader =false
+      this.taskslist = new Array();
+      let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
+      res.forEach(element => {
+        let date = new Date(element.taskStartDate);
+        date.setMonth(date.getMonth() + 1);
+        let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
+        let task: DailyWorkTask = {
+          "SerialNumber": element.serialNumber,
+          "Folio": element.workflowInstanceDataFields.Subject,
+          "Senders": element.workflowInstanceDataFields.Sender,
+          "CreateDate": taskDate,
+          "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+          "Remetente": element.workflowInstanceDataFields.Remetente,
+          "DocumentsQty": element.totalDocuments,
+          "WorkflowName": element.workflowDisplayName,
+          "activityInstanceName": element.activityInstanceName,
+          "Status": element.workflowInstanceDataFields.Status,
+          }
+          this.taskslist.push(task);
         });
-
-        break;
-      case 'PR':
-          this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => {
-            console.log(result);
-            this.taskslist = new Array();
-            this.skeletonLoader = false
-            this.showLoader =false
-
-            let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
-            res.forEach(element => {
-              let date = new Date(element.taskStartDate);
-              date.setMonth(date.getMonth() + 1);
-              let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
-              let task: DailyWorkTask = {
-                "SerialNumber": element.serialNumber,
-                "Folio": element.workflowInstanceDataFields.Subject,
-                "Senders": element.originator.email,
-                "CreateDate": taskDate,
-                "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-                "Remetente": element.workflowInstanceDataFields.Remetente,
-                "DocumentsQty": element.totalDocuments,
-                "WorkflowName": element.workflowDisplayName,
-                "activityInstanceName": element.activityInstanceName,
-                "Status": element.workflowInstanceDataFields.Status,
-                }
-                this.taskslist.push(task);
-              });
-            console.log(this.taskslist);
-            this.expedienteprstore.reset(this.taskslist);
-            this.showLoader = false;
-          });
-        break;
-    }
+      console.log(this.taskslist);
+      this.expedienteprstore.reset(this.taskslist);
+      this.skeletonLoader = false
+    })
   }
 
   refreshing() {
@@ -164,14 +129,14 @@ export class ExpedientesPrPage implements OnInit {
   }
 
   goBack() {
-    let navigationExtras: NavigationExtras = {
-      queryParams: {
-        "expedientes-pr": true,
-      }
-    };
-    this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+    // let navigationExtras: NavigationExtras = {
+    //   queryParams: {
+    //     "expedientes-pr": true,
+    //   }
+    // };
+    // this.router.navigate(['/home/gabinete-digital'], navigationExtras);
 
-    // window.history.back();
+    this.location.back();
 
   }
 

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

@@ -19,10 +19,8 @@ import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
 import { RequestOptionsPage } from 'src/app/shared/popover/request-options/request-options.page';
 import { AuthService } from 'src/app/services/auth.service';
 import { User } from 'src/app/models/user.model';
-import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
 import { ToastService } from 'src/app/services/toast.service';
 import { ForwardPage } from 'src/app/modals/forward/forward.page';
-import { async } from '@angular/core/testing';
 import { PermissionService } from 'src/app/OtherService/permission.service';
 import { Location } from '@angular/common';
 
@@ -496,40 +494,40 @@ export class PedidoPage implements OnInit {
 
   goBack() {
     this.location.back();
-    if(this.task.Status == "Pending" && this.caller == 'gabinete-digital'){
-      if (window.innerWidth <= 700) {
-        this.router.navigate(['/home/gabinete-digital/pendentes']);
-      }
-      else {
+    // if(this.task.Status == "Pending" && this.caller == 'gabinete-digital'){
+    //   if (window.innerWidth <= 700) {
+    //     this.router.navigate(['/home/gabinete-digital/pendentes']);
+    //   }
+    //   else {
 
-        let navigationExtras: NavigationExtras;
+    //     let navigationExtras: NavigationExtras;
 
-        if (this.task.activityInstanceName == 'Concluir Deferimento') {
-          navigationExtras= { queryParams: {"deferimento": true,}};
-        } else if (this.task.activityInstanceName == 'Tarefa de Parecer' ) {
-          navigationExtras = { queryParams: {"parecer": true,}};
-        }
+    //     if (this.task.activityInstanceName == 'Concluir Deferimento') {
+    //       navigationExtras= { queryParams: {"deferimento": true,}};
+    //     } else if (this.task.activityInstanceName == 'Tarefa de Parecer' ) {
+    //       navigationExtras = { queryParams: {"parecer": true,}};
+    //     }
 
-        this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-      }
-    }
-    else {
-      if (window.innerWidth <= 700) {
-        this.router.navigate(['/home/gabinete-digital/pedidos']);
-      }
-      else {
+    //     this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+    //   }
+    // }
+    // else {
+    //   if (window.innerWidth <= 700) {
+    //     this.router.navigate(['/home/gabinete-digital/pedidos']);
+    //   }
+    //   else {
 
-        let navigationExtras: NavigationExtras;
+    //     let navigationExtras: NavigationExtras;
 
-        if (this.task.activityInstanceName == 'Concluir Deferimento') {
-          navigationExtras= { queryParams: {"deferimento": true,}};
-        } else if (this.task.activityInstanceName == 'Tarefa de Parecer' ) {
+    //     if (this.task.activityInstanceName == 'Concluir Deferimento') {
+    //       navigationExtras= { queryParams: {"deferimento": true,}};
+    //     } else if (this.task.activityInstanceName == 'Tarefa de Parecer' ) {
 
-          navigationExtras = { queryParams: {"parecer": true,}};
-        }
-        this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-      }
-    }
+    //       navigationExtras = { queryParams: {"parecer": true,}};
+    //     }
+    //     this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+    //   }
+    // }
   }
 
 }

src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts

@@ -66,66 +66,31 @@ export class ExpedientesPrPage implements OnInit {
 
   LoadList(){
     this.skeletonLoader = true;
-    switch (this.loggeduser.Profile) {
-      case 'MDGPR':
-        this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => {
-          console.log(result);
-
-          this.taskslist = []
-          let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
-
-          res.forEach(element => {
-            let date = new Date(element.taskStartDate);
-            date.setMonth(date.getMonth() + 1);
-            let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
-            let task: DailyWorkTask = {
-              "SerialNumber": element.serialNumber,
-              "Folio": element.workflowInstanceDataFields.Subject,
-              "Senders": element.workflowInstanceDataFields.Sender,
-              "CreateDate": taskDate,
-              "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-              "Remetente": element.workflowInstanceDataFields.Remetente,
-              "DocumentsQty": element.totalDocuments,
-              "WorkflowName": element.workflowDisplayName,
-              "activityInstanceName": element.activityInstanceName,
-              "Status": element.workflowInstanceDataFields.Status,
-              }
-              this.taskslist.push(task);
-          });
-          this.expedienteprstore.reset(this.taskslist);
-          this.skeletonLoader = false;
-        });
-
-        break;
-        case 'PR':
-          this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => {
-            console.log(result);
-            this.taskslist = [];
-            let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
-            res.forEach(element => {
-              let date = new Date(element.taskStartDate);
-              date.setMonth(date.getMonth() + 1);
-              let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
-              let task: DailyWorkTask = {
-                "SerialNumber": element.serialNumber,
-                "Folio": element.workflowInstanceDataFields.Subject,
-                "Senders": element.workflowInstanceDataFields.Sender,
-                "CreateDate": taskDate,
-                "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-                "Remetente": element.workflowInstanceDataFields.Remetente,
-                "DocumentsQty": 0,
-                "WorkflowName": element.workflowDisplayName,
-                "activityInstanceName": element.activityInstanceName,
-                "Status": element.workflowInstanceDataFields.Status,
-                }
-                this.taskslist.push(task);
-            });
-            this.expedienteprstore.reset(this.taskslist);
-            this.skeletonLoader = false;
-          });
-
-        break;
-    }
+    this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => {
+      console.log(result);
+      this.taskslist = [];
+      let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
+      res.forEach(element => {
+        let date = new Date(element.taskStartDate);
+        date.setMonth(date.getMonth() + 1);
+        let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
+        let task: DailyWorkTask = {
+          "SerialNumber": element.serialNumber,
+          "Folio": element.workflowInstanceDataFields.Subject,
+          "Senders": element.workflowInstanceDataFields.Sender,
+          "CreateDate": taskDate,
+          "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+          "Remetente": element.workflowInstanceDataFields.Remetente,
+          "DocumentsQty": 0,
+          "WorkflowName": element.workflowDisplayName,
+          "activityInstanceName": element.activityInstanceName,
+          "Status": element.workflowInstanceDataFields.Status,
+          }
+          this.taskslist.push(task);
+      });
+      this.expedienteprstore.reset(this.taskslist);
+      this.skeletonLoader = false;
+    });
   }
 
   refreshing() {

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

@@ -13,7 +13,7 @@
         Pedidos de Parecer
       </ion-segment-button>
       <ion-segment-button value="deferimento">
-        Pedidos de Defererimento
+        Pedidos de Deferimento
       </ion-segment-button>
     </ion-segment>
   </ion-toolbar>