This commit is contained in:
tiago.kayaya
2021-03-31 16:47:14 +01:00
parent 7ccc359710
commit c77dac0dbe
4 changed files with 22 additions and 6 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
export class Participant{
UserId: string;
UserEmail: string;
UserType: string;
/* Deadline: Date; */
+8 -2
View File
@@ -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(); */
}
}
@@ -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){
@@ -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(){