diff --git a/ionic/src/app/conversation/conversation.page.ts b/ionic/src/app/conversation/conversation.page.ts index da09c2cec5270055a527193bd74c62e12e44dff7..61b8d126bdd2ae3a08783f5a744a8391248eadc9 100644 --- a/ionic/src/app/conversation/conversation.page.ts +++ b/ionic/src/app/conversation/conversation.page.ts @@ -33,6 +33,7 @@ export class ConversationPage implements OnInit { getMessages(){ this.conversationService.messages(this.id).subscribe(data => { + console.log(data) this.messages = data.reverse(); setTimeout(()=>{this.updateScroll();},200); }); @@ -40,7 +41,6 @@ export class ConversationPage implements OnInit { sendMessage(){ this.conversationService.sendMessage(this.text , this.id).subscribe(data => { - console.log(data); this.text = ""; this.getMessages(); }); diff --git a/ionic/src/app/gestion-groupe/gestion-groupe.page.ts b/ionic/src/app/gestion-groupe/gestion-groupe.page.ts index 63b34d3c30f5fd2587a8b70acbab32550f2a5032..4a818987d3262f1030cd12fd55828b3b2ab12427 100644 --- a/ionic/src/app/gestion-groupe/gestion-groupe.page.ts +++ b/ionic/src/app/gestion-groupe/gestion-groupe.page.ts @@ -70,15 +70,20 @@ export class GestionGroupePage implements OnInit { } }) } - if(addUser.length > 0) this.gestionGroupeService.addUser(this.id,addUser).subscribe(data => this.router.navigate(['/conversation/' + this.id])); - if(removeUser.length > 0) this.gestionGroupeService.removeUser(this.id,removeUser).subscribe(data => this.router.navigate(['/conversation/' + this.id])); + if(addUser.length > 0) this.gestionGroupeService.addUser(this.id,addUser).subscribe(data => { }); + if(removeUser.length > 0) this.gestionGroupeService.removeUser(this.id,removeUser).subscribe(data => { }); + + let listeUser = this.usersSelected; + listeUser.push(this.idUser); let body = { "name": name, "description": description, - "users": this.usersSelected + "users": listeUser } - this.gestionGroupeService.updateGroupe(this.id,body).subscribe(data => this.router.navigate(['/conversation/' + this.id])); + this.gestionGroupeService.updateGroupe(this.id,body).subscribe(data => this.router.navigate(['/conversation/' + this.id]).then(() => { + window.location.reload(); + })); } getGroupe(){ diff --git a/ionic/src/app/new-groupe/new-groupe.page.ts b/ionic/src/app/new-groupe/new-groupe.page.ts index 71a6152482f69397020345254b0698a210f37857..070383ad7aead8b531675806408a1aa1892ccbc5 100644 --- a/ionic/src/app/new-groupe/new-groupe.page.ts +++ b/ionic/src/app/new-groupe/new-groupe.page.ts @@ -24,7 +24,9 @@ export class NewGroupePage implements OnInit { groupe.subscribe(res => { console.log('groupe crée : ' + JSON.stringify(res)); if(res.name){ - this.router.navigate(['tabs/tab3']); + this.router.navigate(['tabs/tab3']).then(() => { + window.location.reload(); + }); }else{ this.alertGroup(); } diff --git a/ionic/src/app/tab1/tab1.page.ts b/ionic/src/app/tab1/tab1.page.ts index 7aac82034cce0c8eee96090d06acc3201f2a112d..30b7cefc7c514d5a643452f0e0ad998f0537944a 100644 --- a/ionic/src/app/tab1/tab1.page.ts +++ b/ionic/src/app/tab1/tab1.page.ts @@ -18,7 +18,9 @@ export class Tab1Page { disconnect(){ localStorage.removeItem('token'); localStorage.removeItem('user'); - this.router.navigate(['login']); + this.router.navigate(['login']).then(() => { + window.location.reload(); + }); } } diff --git a/ionic/src/app/tab3/tab3.page.ts b/ionic/src/app/tab3/tab3.page.ts index 6ff556f190e864d7f0d1d694ca66b575209b0908..e814c6937eef31942ebaf8e7bdc178dfb4a2f1b7 100644 --- a/ionic/src/app/tab3/tab3.page.ts +++ b/ionic/src/app/tab3/tab3.page.ts @@ -12,9 +12,13 @@ export class Tab3Page { results; constructor(private tab3Service: Tab3Service) { + } + + ngOnInit() { this.getGroups(); } + getGroups(){ this.tab3Service.getGroups().subscribe(data => { this.results = data;