diff --git a/src/app/components/family-connect/family-connect.component.html b/src/app/components/family-connect/family-connect.component.html index a66e260..4ee7f54 100644 --- a/src/app/components/family-connect/family-connect.component.html +++ b/src/app/components/family-connect/family-connect.component.html @@ -59,7 +59,13 @@ Let's : - + Chat do Number Games do Science Knowledge @@ -71,7 +77,7 @@ - Send Invite + Send Invite diff --git a/src/app/components/family-connect/family-connect.component.ts b/src/app/components/family-connect/family-connect.component.ts index 4ad79b3..82e1365 100644 --- a/src/app/components/family-connect/family-connect.component.ts +++ b/src/app/components/family-connect/family-connect.component.ts @@ -11,8 +11,10 @@ import {NavController} from "@ionic/angular"; }) export class FamilyConnectComponent implements OnInit { show_invite:boolean = false; -show_connect: boolean = false; -call_active:boolean= false; +show_connect:boolean = false; +call_active:boolean = false; +isDisabled:boolean = true; + @ViewChild('select_activity') select_activity; connectStart : number = 0; @@ -41,10 +43,10 @@ connectStart : number = 0; }); addEventListener('app-family-invite-accepted', (data:any) => { - console.log("ACCEPT CALL DATA ", data); //connectData - console.log("ACCEPT CALL DATA ACCEPTED", data.detail.data.message.connectData); //connectData - this.router.navigate(['familyconnectaction'], { state: data.detail.data.message.connectData }); + //console.log("ACCEPT CALL DATA ", data); //connectData + // console.log("ACCEPT CALL DATA ACCEPTED", data.detail.data.message.connectData); //connectData this.initialInviteState(); + this.router.navigate(['familyconnectaction'], { state: data.detail.data.message.connectData }); }); } @@ -70,8 +72,8 @@ connectStart : number = 0; // let us tell the invitee to join us in the room this.socketToolsService.familyInviteConnect( currentConnectData ); // let's go to the page - this.router.navigate(['familyconnectaction'],{ state: currentConnectData }); this.initialInviteState(); + this.router.navigate(['familyconnectaction'],{ state: currentConnectData }); } ngOnInit() { this.getFamilyList(); @@ -119,9 +121,10 @@ connectStart : number = 0; this.familyResult = familyResult; console.log("familyResult RETURN->", this.familyResult); this.familyData = this.familyResult.result_list; - } ); } - + verifyEntry(){ + this.isDisabled = this.select_activity == ''; + } }