This commit is contained in:
tiago.kayaya
2021-05-21 16:36:55 +01:00
parent 4a95f7ede0
commit d9947b39c5
18 changed files with 164 additions and 34 deletions
@@ -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'">
@@ -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');
}
@@ -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">
@@ -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');
}
@@ -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]" -->
@@ -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');
}