Merge branch 'developer' of bitbucket.org:equilibriumito/gabinete-digital into developer

This commit is contained in:
Peter Maquiran
2021-05-19 11:42:07 +01:00
12 changed files with 121 additions and 85 deletions
@@ -56,9 +56,13 @@ export class DespachosPage implements OnInit {
//Inicializar segment
this.segment = "despachos";
this.LoadList();
this.authService.userData$.subscribe((res:any)=>{
console.log(res);
});
/* this.authService.userData$.subscribe((res:any)=>{
//console.log(res);
}); */
let u = this.authService.userData$.toPromise();
console.log(u);
}
segmentChanged(ev: any) {
this.LoadList();
@@ -77,6 +81,7 @@ export class DespachosPage implements OnInit {
this.despachoList = new Array();
let result = await this.processes.GetTasksList("Despacho", false).toPromise();
//let despachos = result.reverse().filter(data => data.activityInstanceName == "Despacho (Paralelo)");
console.log(result);
+8 -11
View File
@@ -18,19 +18,16 @@ export class HeaderPage implements OnInit {
loggeduser: User;
constructor(
private router: Router,private modalController: ModalController,
private router: Router,
private modalController: ModalController,
private animationController: AnimationController,
authService: AuthService) {
authService: AuthService
) {
this.loggeduser = authService.ValidatedUser;
router.events.subscribe((val) => {
this.showSearch=false;
this.modalController.dismiss()
});
router.events.subscribe((val) => {
this.showSearch=false;
//this.modalController.dismiss();
});
}
ngOnInit() {