From c77dac0dbe6b88b3a1d111443798241593848344 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 31 Mar 2021 16:47:14 +0100 Subject: [PATCH] save --- src/app/models/participant.model.ts | 2 +- src/app/pages/events/events.page.ts | 10 ++++++++-- .../expedient-task-modal.page.ts | 4 ++-- .../pages/gabinete-digital/gabinete-digital.page.ts | 12 +++++++++++- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/app/models/participant.model.ts b/src/app/models/participant.model.ts index f2b96575b..f8e12bd1d 100644 --- a/src/app/models/participant.model.ts +++ b/src/app/models/participant.model.ts @@ -1,5 +1,5 @@ export class Participant{ - UserId: string; + UserEmail: string; UserType: string; /* Deadline: Date; */ diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index a18e8d180..4e110aa97 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -2,7 +2,7 @@ import { Component, OnInit, LOCALE_ID, EventEmitter, Output } from '@angular/cor import { Event } from '../../models/event.model'; import { EventsService } from 'src/app/services/events.service'; -import { Router } from '@angular/router'; +import { NavigationExtras, Router } from '@angular/router'; import { ActivatedRoute, NavigationEnd } from '@angular/router'; import { AlertService } from 'src/app/services/alert.service'; import { AuthService } from 'src/app/services/auth.service'; @@ -315,7 +315,13 @@ export class EventsPage implements OnInit { } else{ console.log('ttt'); - this.router.navigate(['/home/gabinete-digital']); + let navigationExtras: NavigationExtras = { + queryParams: { + "show": true, + } + }; + + this.router.navigate(['/home/gabinete-digital'], navigationExtras); /* this.gabineteService.openExpedientListPage(); */ } } diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts index 08149a595..c2aef100a 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts @@ -174,7 +174,7 @@ export class ExpedientTaskModalPage implements OnInit { if(newattendees!= null){ newattendees.forEach(newattendee => { let att = { - 'UserId': newattendee.EmailAddress, + 'UserEmail': newattendee.EmailAddress, 'UserType': 'I', }; if(this.participants == null){ @@ -204,7 +204,7 @@ export class ExpedientTaskModalPage implements OnInit { if(newattendees!= null){ newattendees.forEach(newattendee => { let att = { - 'UserId': newattendee.EmailAddress, + 'UserEmail': newattendee.EmailAddress, 'UserType': 'CC', }; if(this.participants == null){ diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 8aad715eb..61dd1cfc3 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -5,6 +5,7 @@ import { EventsService } from 'src/app/services/events.service'; import { ModalController } from '@ionic/angular'; import { EventListPage } from './event-list/event-list.page'; import { ExpedientePage } from './expediente/expediente.page'; +import { ActivatedRoute } from '@angular/router'; @Component({ selector: 'app-gabinete-digital', @@ -42,7 +43,9 @@ export class GabineteDigitalPage implements OnInit { constructor( private processesbackend:ProcessesService, private modalController: ModalController, - private alertService: AlertService) { + private alertService: AlertService, + private route: ActivatedRoute, + ) { window.onresize = (event) => { // if not mobile remove all component @@ -53,6 +56,12 @@ export class GabineteDigitalPage implements OnInit { }; this.adjastModalHeight(); + + this.route.queryParams.subscribe(params => { + if(params["show"]){ + this.openExpedientListPage(); + } + }); } @@ -95,6 +104,7 @@ this.processesbackend.GetActionsList().subscribe(res=>{ console.log(res); }); + } closeAllDesktopComponents(){