mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-19 21:06:06 +00:00
Merge branch 'developer' of bitbucket.org:equilibriumito/gabinete-digital into developer
This commit is contained in:
@@ -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);
|
||||
|
||||
|
||||
@@ -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() {
|
||||
|
||||
Reference in New Issue
Block a user