diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index dbf5fdb92..3920188ba 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -433,7 +433,7 @@ export class AgendaPage implements OnInit { }); }); - this.timelineFilter(this.timelineFilterState); + // this.timelineFilter(this.timelineFilterState); this.myCal.update(); this.myCal.loadEvents(); @@ -463,7 +463,7 @@ export class AgendaPage implements OnInit { }); - this.timelineFilter(this.timelineFilterState); + // this.timelineFilter(this.timelineFilterState); this.myCal.update(); this.myCal.loadEvents(); diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index 7a7cdec78..5ad4aa723 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -62,11 +62,11 @@ export class LoginPage implements OnInit { await alert.present(); } - loginRocketChat(user: any) { + loginRocketChat() { let postData = { - "user": user.username, - "password": user.password, + "user": this.username, + "password": this.password, } this.authService.loginChat(postData).subscribe((res: any) => { console.log(res.data); @@ -128,7 +128,7 @@ export class LoginPage implements OnInit { BasicAuthKey: "" } if (await this.authService.login(this.userattempt)) { - this.loginRocketChat(this.userattempt); + this.loginRocketChat(); this.storeUserIdANdToken(); this.router.navigate(['/home/events']);