save

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

@@ -1,3 +1,6 @@
+<ion-header class="ion-no-border">
+  <app-header></app-header>
+</ion-header>
 <ion-menu autoHide="false" side="end" content-id="main-content">
   <ion-header>
     <ion-toolbar translucent>
@@ -37,9 +40,11 @@
   <div class="main-content d-flex height-100">
     <div class="content d-flex flex-column" *ngIf="task">
       <div class="main-header">
-        <div class="title-content">
-          <app-btn-modal-dismiss></app-btn-modal-dismiss>
-          <div class="middle">
+        <div class="title-content d-flex justify-space-between">
+          <div class="font-30 cursor-pointer" (click)="goBack()" defaultHref="#">
+            <ion-icon  slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+          </div>
+          <div class="middle d-flex align-center flex-grow-1">
             <ion-label class="title">{{ task.Folio}}</ion-label>
           </div>
           <div class="div-icon" (click)="openOptions()">

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

@@ -1,4 +1,9 @@
 @import '~src/function.scss';
+.main-content{
+  background-color: #fff !important;
+  border-top-left-radius: 25px;
+  border-top-right-radius: 25px;
+}
 .content{
   padding: 30px 20px 0 20px !important;
   margin: 0;

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

@@ -4,10 +4,10 @@ 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 } from '../../../../models/dailyworktask.model';
-import { ActivatedRoute, Router } from '@angular/router';
+import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
 import { formatDate } from '@angular/common';
 import { Event } from '../../../../models/event.model';
-import { MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
+import { MenuController, ModalController, PopoverController } from '@ionic/angular';
 import { AlertService } from 'src/app/services/alert.service';
 import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
 import { momentG }  from 'src/plugin/momentG'
@@ -47,11 +47,15 @@ export class DespachoPrPage implements OnInit {
     private menu: MenuController,
     private router: Router,
     private modalController: ModalController,
-    private navParams: NavParams,
     private alertService: AlertService,
-    public popoverController: PopoverController) { 
-      this.serialnumber = this.navParams.get('serialNumber');
-      this.profile = this.navParams.get('profile');
+    public popoverController: PopoverController,
+    private activatedRoute: ActivatedRoute,) { 
+      this.activatedRoute.queryParams.subscribe(params => {
+        if(params["serialNumber"]) {
+          this.serialnumber = params["serialNumber"];
+          console.log(params["serialNumber"]);
+        }
+      });
     }
 
   ngOnInit() {
@@ -74,6 +78,15 @@ export class DespachoPrPage implements OnInit {
     this.modalController.dismiss();
   }
 
+  goBack(){
+    let navigationExtras: NavigationExtras = {
+      queryParams: {
+          "despachospr": true,
+      }
+    };
+    this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+  }
+
 
   async LoadTaskDetail(serial: string) {
     this.processes.GetTask(serial).subscribe(res => {

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

@@ -7,12 +7,14 @@ import { IonicModule } from '@ionic/angular';
 import { DespachosPrPageRoutingModule } from './despachos-pr-routing.module';
 
 import { DespachosPrPage } from './despachos-pr.page';
+import { SharedModule } from 'src/app/shared/shared.module';
 
 @NgModule({
   imports: [
     CommonModule,
     FormsModule,
     IonicModule,
+    SharedModule,
     DespachosPrPageRoutingModule
   ],
   declarations: [DespachosPrPage]

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

@@ -1,3 +1,4 @@
+
 <ion-header class="ion-no-border">
   <div class="main-header">
     <div class="thetitle">

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

@@ -1,3 +1,7 @@
+<ion-header class="ion-no-border">
+  <app-header></app-header>
+</ion-header>
+
 <ion-menu autoHide="false" side="end" content-id="main-content">
   <ion-header>
     <ion-toolbar translucent>
@@ -37,9 +41,11 @@
   <div class="main-content d-flex height-100">
     <div class="content d-flex flex-column" *ngIf="task">
       <div class="main-header">
-        <div class="title-content">
-          <app-btn-modal-dismiss></app-btn-modal-dismiss>
-          <div class="middle">
+        <div class="title-content d-flex justify-space-between">
+          <div class="font-30 cursor-pointer" (click)="goBack()" defaultHref="#">
+            <ion-icon  slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+          </div>
+          <div class="middle d-flex align-center flex-grow-1">
             <ion-label class="title">{{ task.Folio}}</ion-label>
           </div>
           <div class="div-icon" (click)="openOptions()">

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

@@ -1,4 +1,9 @@
 @import '~src/function.scss';
+.main-content{
+  background-color: #fff !important;
+  border-top-left-radius: 25px;
+  border-top-right-radius: 25px;
+}
 .content{
   padding: 30px 20px 0 20px !important;
   margin: 0;

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

@@ -4,10 +4,10 @@ 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 } from '../../../../models/dailyworktask.model';
-import { ActivatedRoute, Router } from '@angular/router';
+import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
 import { formatDate } from '@angular/common';
 import { Event } from '../../../../models/event.model';
-import { MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
+import { MenuController, ModalController, PopoverController } from '@ionic/angular';
 import { AlertService } from 'src/app/services/alert.service';
 import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
 import { momentG }  from 'src/plugin/momentG'
@@ -45,13 +45,18 @@ export class DespachoPage implements OnInit {
     private attachmentsService: AttachmentsService,
     private events: EventsService,
     private menu: MenuController,
-    private router: Router,
     private modalController: ModalController,
-    private navParams: NavParams,
     private alertService: AlertService,
-    public popoverController: PopoverController) { 
-      this.serialnumber = this.navParams.get('serialNumber');
-      this.profile = this.navParams.get('profile');
+    public popoverController: PopoverController,
+    private activatedRoute: ActivatedRoute,
+    private router: Router,
+    ) { 
+      this.activatedRoute.queryParams.subscribe(params => {
+        if(params["serialNumber"]) {
+          this.serialnumber = params["serialNumber"];
+          console.log(params["serialNumber"]);
+        }
+      });
     }
 
   ngOnInit() {
@@ -74,6 +79,15 @@ export class DespachoPage implements OnInit {
     this.modalController.dismiss();
   }
 
+  goBack(){
+    let navigationExtras: NavigationExtras = {
+      queryParams: {
+          "despachos": true,
+      }
+    };
+    this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+  }
+
 
   async LoadTaskDetail(serial: string) {
     this.processes.GetTask(serial).subscribe(res => {

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

@@ -1,10 +1,16 @@
+<ion-header class="ion-no-border">
+  <app-header></app-header>
+</ion-header>
+
 <ion-content>
   <div class="main-content d-flex height-100">
     <div class="content d-flex flex-column" *ngIf="task">
       <div class="main-header">
-        <div class="title-content">
-          <app-btn-modal-dismiss></app-btn-modal-dismiss>
-          <div class="middle">
+        <div class="title-content d-flex justify-space-between">
+          <div class="font-30 cursor-pointer" (click)="goBack()" defaultHref="#">
+            <ion-icon  slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+          </div>
+          <div class="middle d-flex align-center flex-grow-1 ">
             <ion-label class="title">{{ task.Folio}}</ion-label>
           </div>
           <div class="div-icon" (click)="openOptions()">

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

@@ -1,4 +1,9 @@
 @import '~src/function.scss';
+.main-content{
+  background-color: #fff !important;
+  border-top-left-radius: 25px;
+  border-top-right-radius: 25px;
+}
 .content{
   padding: 30px 20px 0 20px !important;
   margin: 0;

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

@@ -1,11 +1,12 @@
 import { Component, OnInit } from '@angular/core';
-import { ModalController, NavParams, PopoverController } from '@ionic/angular';
+import { ModalController, PopoverController } from '@ionic/angular';
 import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
 import { momentG }  from 'src/plugin/momentG';
 
 import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
+import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
 
 @Component({
   selector: 'app-diploma',
@@ -27,19 +28,34 @@ export class DiplomaPage implements OnInit {
   customDate: any
 
   constructor(
-    private navParams: NavParams,
     private processes: ProcessesService,
     public popoverController: PopoverController,
     private modalController: ModalController,
     private iab: InAppBrowser,
+    private activatedRoute: ActivatedRoute,
+    private router: Router,
   ) { 
-    this.serialnumber = this.navParams.get('serialNumber');
-    this.profile = this.navParams.get('profile');
+    this.activatedRoute.queryParams.subscribe(params => {
+      if(params["serialNumber"]) {
+        this.serialnumber = params["serialNumber"];
+        console.log(params["serialNumber"]);
+      }
+    });
 
-    this.LoadTaskDetail(this.serialnumber);
   }
 
   ngOnInit() {
+    this.profile = "mdgpr";
+    this.LoadTaskDetail(this.serialnumber);
+  }
+
+  goBack(){
+    let navigationExtras: NavigationExtras = {
+      queryParams: {
+          "diplomas": true,
+      }
+    };
+    this.router.navigate(['/home/gabinete-digital'], navigationExtras);
   }
 
   async openOptions(taskAction?: any) {

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

@@ -28,7 +28,7 @@
         <ion-item 
             class="expediente ion-no-padding cursor-pointer"  
             *ngFor = "let task of despachoList; let i = index"
-            (click)="viewExpedientDetail(task.SerialNumber)"
+            (click)="goToDespachoPr(task.SerialNumber)"
             >
             <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
               <div class="item width-100" *ngIf="task.Status == 'Active'">

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

@@ -16,6 +16,7 @@ import { AuthService } from 'src/app/services/auth.service';
 import { DespachoPage } from 'src/app/pages/gabinete-digital/despachos/despacho/despacho.page';
 import { DespachoPrPage } from 'src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page';
 import { User } from 'src/app/models/user.model';
+import { NavigationExtras, Router } from '@angular/router';
 
 @Component({
   selector: 'app-despachos-pr',
@@ -53,6 +54,7 @@ constructor (
   private modalController: ModalController,
   private alertService: AlertService,
   private authService: AuthService,
+  private router: Router,
   
   ) { 
     this.profile = 'mdgpr';
@@ -71,6 +73,15 @@ segmentChanged(ev: any) {
   this.LoadList();
 }
 
+goToDespachoPr(serialNumber:any){
+  let navigationExtras: NavigationExtras = {
+    queryParams: {
+        "serialNumber": serialNumber,
+    }
+  };
+  this.router.navigate(['/home/gabinete-digital/despachos-pr/despacho-pr'], navigationExtras);
+}
+
   notImplemented(){
     this.alertService.presentAlert('Funcionalidade em desenvolvimento');
   }

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

@@ -24,7 +24,7 @@
         <ion-item 
             class="expediente ion-no-padding cursor-pointer"  
             *ngFor = "let task of despachoList; let i = index"
-            (click)="viewExpedientDetail(task.SerialNumber)"
+            (click)="goToDespacho(task.SerialNumber)"
             >
             <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
               <div class="item width-100">

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

@@ -14,6 +14,7 @@ import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discar
 
 import { AuthService } from 'src/app/services/auth.service';
 import { DespachoPage } from 'src/app/pages/gabinete-digital/despachos/despacho/despacho.page';
+import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
 
 @Component({
   selector: 'app-despachos',
@@ -48,23 +49,38 @@ export class DespachosPage implements OnInit {
    private modalController: ModalController,
    private alertService: AlertService,
    private authService: AuthService,
+   private router: Router,
+   private activatedRoute: ActivatedRoute,
    ) { 
      this.profile = 'mdgpr';
+     this.activatedRoute.queryParams.subscribe(params => {
+      if(params["serialNumber"]) {
+        this.serialNumber = params["serialNumber"];
+        console.log(params["serialNumber"]);
+      }
+    });
    }
 
  ngOnInit() {
    //Inicializar segment
    this.segment = "despachos";
    this.LoadList();
-   /* this.authService.userData$.subscribe((res:any)=>{
-    //console.log(res); 
-  }); */
   
  }
+
  segmentChanged(ev: any) {
    this.LoadList();
  }
 
+ goToDespacho(serialNumber:any){
+  let navigationExtras: NavigationExtras = {
+    queryParams: {
+        "serialNumber": serialNumber,
+    }
+  };
+  this.router.navigate(['/home/gabinete-digital/despachos/despacho'], navigationExtras);
+}
+
  notImplemented(){
    this.alertService.presentAlert('Funcionalidade em desenvolvimento');
  }

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

@@ -36,7 +36,7 @@
         <ion-item 
             class="expediente ion-no-padding cursor-pointer"  
             *ngFor = "let task of diplomasList"
-            (click)="viewPedidoDetail(task.SerialNumber)"
+            (click)="goToDiploma(task.SerialNumber)"
             >
             <!-- (click)="viewExpedientDetail(task.SerialNumber)" -->
             <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->

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

@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
-import { Router } from '@angular/router';
+import { NavigationExtras, Router } from '@angular/router';
 import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { formatDate } from '@angular/common';
@@ -26,6 +26,7 @@ constructor(
   private processes:ProcessesService,
   private modalController: ModalController,
   private alertService: AlertService,
+  private router: Router,
   ) { 
     this.profile = 'mdgpr';
     this.segment = 'validar'
@@ -40,6 +41,15 @@ segmentChanged(ev: any) {
   this.LoadList();
 }
 
+goToDiploma(serialNumber:any){
+  let navigationExtras: NavigationExtras = {
+    queryParams: {
+        "serialNumber": serialNumber,
+    }
+  };
+  this.router.navigate(['/home/gabinete-digital/diplomas/diploma'], navigationExtras);
+}
+
 notImplemented(){
   this.alertService.presentAlert('Funcionalidade em desenvolvimento');
 }

src/global.scss

@@ -613,11 +613,26 @@ app-expediente-detail ion-content .main-content{
     margin: 0px auto !important;
 }
 
+app-despacho ion-content .main-content{
+    max-width: 1366px !important;
+    margin: 0px auto !important;
+}
+
+app-despacho-pr ion-content .main-content{
+    max-width: 1366px !important;
+    margin: 0px auto !important;
+}
+
 app-pedido ion-content .main-content{
     max-width: 1366px !important;
     margin: 0px auto !important;
 }
 
+app-diploma ion-content .main-content{
+    max-width: 1366px !important;
+    margin: 0px auto !important;
+}
+
 app-gabinete-digital ion-content .main-content{
     max-width: 1366px !important;
     margin: 0px auto !important;