Fix merge

This commit is contained in:
Peter Maquiran
2021-05-25 13:40:55 +01:00
24 changed files with 375 additions and 232 deletions
@@ -263,11 +263,12 @@ export class GabineteDigitalPage implements OnInit {
console.log(profile);
this.closeAllDesktopComponents();
let navigationExtras: NavigationExtras = { queryParams: {"eventos": true,}};
if( window.innerWidth <= 800){
this.openEventsToApproveList(profile);
//this.openEventsToApproveList(profile);
this.router.navigate(['/home/gabinete-digital/event-list']);
}
else{
let navigationExtras: NavigationExtras = { queryParams: {"eventos": true,}};
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
this.showEventsToApprove = true;
}
@@ -296,7 +297,8 @@ export class GabineteDigitalPage implements OnInit {
openExpedientListPage() {
this.closeAllDesktopComponents();
if( window.innerWidth <= 800) {
this.openExpedientList();
//this.openExpedientList();
this.router.navigate(['/home/gabinete-digital/expediente']);
}
else {
this.selectedElement='Correspondence'