save

src/app/home/home-routing.module.ts

@@ -191,6 +191,19 @@ const routes: Routes = [
               },
             ]
           },
+          {
+            path: 'despachos-pr',
+            children: [
+              {
+                path: '',
+                loadChildren: ()=> import('../pages/gabinete-digital/despachos-pr/despachos-pr.module').then(m => m.DespachosPrPageModule),
+              },
+              {
+                path:':SerialNumber/:caller',
+                loadChildren: ()=> import('../pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.module').then(m => m.DespachoPrPageModule),
+              },
+            ]
+          },
           {
             path: 'pedidos',
             children: [

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

@@ -22,6 +22,7 @@ import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.p
 import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
 import { DespachosPrOptionsPage } from 'src/app/shared/popover/despachos-pr-options/despachos-pr-options.page';
 import { ToastService } from 'src/app/services/toast.service';
+import { Location } from '@angular/common'
 
 @Component({
   selector: 'app-despacho-pr',
@@ -39,6 +40,7 @@ export class DespachoPrPage implements OnInit {
   fulltask: any;
   eventsList: Event[];
   serialnumber: string;
+  caller: string;
   profile: string;
   intervenientes: any;
   cc: any = [];
@@ -55,11 +57,15 @@ export class DespachoPrPage implements OnInit {
     public popoverController: PopoverController,
     private activatedRoute: ActivatedRoute,
     private animationController: AnimationController,
-    private toastService: ToastService,) {
-      this.activatedRoute.queryParams.subscribe(params => {
-        if(params["serialNumber"]) {
-          this.serialnumber = params["serialNumber"];
-          console.log(params["serialNumber"]);
+    private toastService: ToastService,
+    private location: Location,
+    ) {
+      this.activatedRoute.paramMap.subscribe(params => {
+        if(params["params"].SerialNumber) {
+          this.serialnumber = params["params"].SerialNumber;
+        }
+        if(params["params"].caller) {
+          this.caller = params["params"].caller;
         }
       });
     }
@@ -85,17 +91,7 @@ export class DespachoPrPage implements OnInit {
   }
 
   goBack() {
-    if (window.innerWidth <= 800) {
-      this.router.navigate(['/home/gabinete-digital/despachos-pr']);
-    } else {
-      let navigationExtras: NavigationExtras = {
-        queryParams: {
-          "despachospr": true,
-        }
-      };
-      this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-    }
-
+    this.location.back();
   }
 
 

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

@@ -90,12 +90,7 @@ export class DespachosPrPage implements OnInit {
   }
 
   goToDespachoPr(serialNumber:any){
-    let navigationExtras: NavigationExtras = {
-      queryParams: {
-        "serialNumber": serialNumber,
-      }
-    };
-    this.router.navigate(['/home/gabinete-digital/despachos-pr/despacho-pr'], navigationExtras);
+    this.router.navigate(['/home/gabinete-digital/despachos-pr',serialNumber,'gabinete-digital']);
   }
 
   notImplemented(){

src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts

@@ -12,6 +12,7 @@ import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.p
 import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
 import { DeplomaOptionsPage } from 'src/app/shared/popover/deploma-options/deploma-options.page';
 import { ToastService } from 'src/app/services/toast.service';
+import { Location } from '@angular/common'
 
 @Component({
   selector: 'app-diploma-assinar',
@@ -29,7 +30,8 @@ export class DiplomaAssinarPage implements OnInit {
   intervenientes: any;
   cc: any = [];
   attachments:any;
-  customDate: any
+  customDate: any;
+  caller:string;
 
   constructor(
     private processes: ProcessesService,
@@ -39,12 +41,15 @@ export class DiplomaAssinarPage implements OnInit {
     private activatedRoute: ActivatedRoute,
     private router: Router,
     private animationController: AnimationController,
-    private toastService: ToastService
+    private toastService: ToastService,
+    private location: Location,
   ) {
-    this.activatedRoute.queryParams.subscribe(params => {
-      if(params["serialNumber"]) {
-        this.serialnumber = params["serialNumber"];
-        console.log(params["serialNumber"]);
+    this.activatedRoute.paramMap.subscribe(params => {
+      if(params["params"].SerialNumber) {
+        this.serialnumber = params["params"].SerialNumber;
+      }
+      if(params["params"].caller) {
+        this.caller = params["params"].caller;
       }
     });
 
@@ -56,17 +61,7 @@ export class DiplomaAssinarPage implements OnInit {
   }
 
   goBack() {
-    if (window.innerWidth <= 800) {
-      this.router.navigate(['/home/gabinete-digital/diplomas-assinar']);
-    } else {
-      let navigationExtras: NavigationExtras = {
-        queryParams: {
-          "diplomasassinar": true,
-        }
-      }
-
-      this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-    }
+    this.location.back();
   }
 
   async openOptions(taskAction?: any) {

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

@@ -48,15 +48,10 @@ export class DiplomasAssinarPage implements OnInit {
     });
   }
 
-  
+
 
   goToDiploma(serialNumber:any){
-    let navigationExtras: NavigationExtras = {
-      queryParams: {
-        "serialNumber": serialNumber,
-      }
-    };
-    this.router.navigate(['/home/gabinete-digital/diplomas-assinar/diploma-assinar'], navigationExtras);
+    this.router.navigate(['/home/gabinete-digital/diplomas-assinar',serialNumber,'gabinete-digital']);
   }
 
  async refreshing() {
@@ -66,7 +61,7 @@ export class DiplomasAssinarPage implements OnInit {
   }
 
   doRefresh(event) {
-    
+
     setTimeout(() => {
       this.LoadList();
     }, 1000);
@@ -123,7 +118,7 @@ export class DiplomasAssinarPage implements OnInit {
 
     this.skeletonLoader = false
     this.showLoader = false;
-    
+
   }
 
   goBack() {

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

@@ -12,6 +12,7 @@ import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.p
 import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
 import { DeplomaOptionsPage } from 'src/app/shared/popover/deploma-options/deploma-options.page';
 import { ToastService } from 'src/app/services/toast.service';
+import { Location } from '@angular/common';
 
 @Component({
   selector: 'app-diploma',
@@ -42,6 +43,7 @@ export class DiplomaPage implements OnInit {
     private router: Router,
     private animationController: AnimationController,
     private toastService: ToastService,
+    private location: Location,
   ) {
     this.activatedRoute.paramMap.subscribe(params => {
       console.log(params["params"]);
@@ -63,7 +65,8 @@ export class DiplomaPage implements OnInit {
   }
 
   goBack() {
-    if(this.task.Status == "Pending" && this.caller == 'gabinete-digital'){
+    this.location.back();
+    /* if(this.task.Status == "Pending" && this.caller == 'gabinete-digital'){
       if (window.innerWidth < 801) {
         this.router.navigate(['/home/gabinete-digital/pendentes']);
       }
@@ -87,7 +90,7 @@ export class DiplomaPage implements OnInit {
         }
         this.router.navigate(['/home/gabinete-digital'], navigationExtras);
       }
-    }
+    } */
   }
 
   async openOptions(taskAction?: any) {

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

@@ -13,6 +13,7 @@ import { momentG }  from 'src/plugin/momentG'
 import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page';
 import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
 import { ToastService } from 'src/app/services/toast.service';
+import { Location } from '@angular/common';
 
 @Component({
   selector: 'app-expediente-detail',
@@ -48,6 +49,7 @@ export class ExpedienteDetailPage implements OnInit {
     public popoverController: PopoverController,
     private activatedRoute: ActivatedRoute,
     private toastService: ToastService,
+    private location: Location,
   ) {
     this.activatedRoute.paramMap.subscribe(params => {
       if(params["params"].SerialNumber) {
@@ -73,7 +75,8 @@ export class ExpedienteDetailPage implements OnInit {
   }
 
   goBack() {
-    if(this.task.Status == "Pending" && this.caller != 'events'){
+    this.location.back();
+    /* if(this.task.Status == "Pending" && this.caller != 'events'){
       if (window.innerWidth <= 800) {
         this.router.navigate(['/home/gabinete-digital/pendentes']);
       }
@@ -108,7 +111,7 @@ export class ExpedienteDetailPage implements OnInit {
 
         }
       });
-    }
+    } */
   }
 
   sendExpedienteToPending() {

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

@@ -25,6 +25,7 @@ import { ToastService } from 'src/app/services/toast.service';
 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';
 
 @Component({
   selector: 'app-expediente-pr',
@@ -63,6 +64,7 @@ export class ExpedientePrPage implements OnInit {
     private animationController: AnimationController,
     private toastService: ToastService,
     private attachmentsService: AttachmentsService,
+    private location: Location,
 
     ) {
       this.loggeduser = userAuth.ValidatedUser;
@@ -105,7 +107,8 @@ export class ExpedientePrPage implements OnInit {
   }
 
   goBack() {
-    if(this.task.Status == "Pending" && this.caller != 'events'){
+    this.location.back();
+    /* if(this.task.Status == "Pending" && this.caller != 'events'){
       if (window.innerWidth <= 800) {
         this.router.navigate(['/home/gabinete-digital/pendentes']);
       }
@@ -139,7 +142,7 @@ export class ExpedientePrPage implements OnInit {
             break;
         }
       });
-    }
+    } */
   }
 
   sendExpedienteToPending(){

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

@@ -61,7 +61,7 @@
                 <div
                   class="item-wrapper ion-no-padding cursor-pointer"
                   *ngFor = "let task of allProcessesList"
-                  (click)="viewProcessDetails()">
+                  (click)="viewProcessDetails(task.SerialNumber, task.WorkflowName, task.activityInstanceName)">
                   <div class="item width-100">
                     <div class="item-top-detail">
                       <div class="item-subject">

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

@@ -247,8 +247,44 @@ export class GabineteDigitalPage implements OnInit {
     thedate.getMinutes();
   }
 
-  viewProcessDetails(){
-
+  viewProcessDetails(serialNumber:string, workflowName:string, activityName:string){
+    if(workflowName == 'Despacho') {
+      if(activityName == 'Tarefa de Despacho'){
+        this.router.navigate(['/home/gabinete-digital/despachos',serialNumber,'gabinete-digital']);
+      }
+    }
+    else if(workflowName == 'Despacho do Presidente da República') {
+      if(activityName == 'Tarefa de Despacho'){
+        this.router.navigate(['/home/gabinete-digital/despachos-pr',serialNumber,'gabinete-digital']);
+      }
+      else if(activityName == 'Revisar Diploma' || activityName == 'Assinar Diploma'){
+        this.router.navigate(['/home/gabinete-digital/diplomas',serialNumber,'gabinete-digital']);
+      }
+      else if(activityName == 'Diploma Assinado'){
+        this.router.navigate(['/home/gabinete-digital/diplomas-assinar',serialNumber,'gabinete-digital']);
+      }
+    }
+    else if(workflowName == 'Pedido de Parecer' || workflowName == 'Pedido de Deferimento') {
+      this.router.navigate(['/home/gabinete-digital/pedidos',serialNumber,'gabinete-digital']);
+    }
+    else if(workflowName == 'Expediente') {
+      this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']);
+    }
+    else if(workflowName == 'Expediente do Presidente' && this.loggeduser.Profile == 'PR') {
+      this.router.navigate(['/home/gabinete-digital/expedientes-pr',serialNumber,'gabinete-digital']);
+    }
+    else if (workflowName == "Pedido de Parecer do Presidente") {
+      this.router.navigate(['/home/gabinete-digital/pedidos',serialNumber,'gabinete-digital']);
+    }
+    /* else if (workflowName == "Expediente") {
+      this.router.navigate(['/home/gabinete-digital/pedidos',serialNumber,'gabinete-digital']);
+    } */
+    else if(workflowName == 'Agenda Pessoal PR' || workflowName == 'Agenda Oficial PR' || workflowName == 'Agenda Oficial MDGPR' || workflowName == 'Agenda Pessoal MDGPR') {
+      this.router.navigate(['/home/gabinete-digital/event-list/approve-event',serialNumber, 'gabinete-digital']);
+    }
+    else  {
+      console.log('cant find page for this task')
+    }
   }
 
   onSegmentVistaChange(){