peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-20 21:35:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into developer

Browse Source
This commit is contained in:
tiago.kayaya
2021-02-10 05:33:34 +01:00
parent fd6e66de16 f925b24310
commit f39daac42b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.page.ts
+2 -2
View File
@@ -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();
src/app/pages/login/login.page.ts
+4 -4
View File
@@ -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']);