diff --git a/src/app/components/family-connect/family-connect.component.html b/src/app/components/family-connect/family-connect.component.html
index 311bfd6..a66e260 100644
--- a/src/app/components/family-connect/family-connect.component.html
+++ b/src/app/components/family-connect/family-connect.component.html
@@ -67,7 +67,9 @@
- Cancel
+
+
+
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 40aed9f..4ad79b3 100644
--- a/src/app/components/family-connect/family-connect.component.ts
+++ b/src/app/components/family-connect/family-connect.component.ts
@@ -31,6 +31,7 @@ connectStart : number = 0;
this.show_invite = false;
this.session_image_server = this.sessionDataProviderService.session_image_server;
this.curr_session = this.sessionDataProviderService.session;
+ this.select_activity = 'chat';
addEventListener('app-family-invite', (data:any) => {
console.log("CALL DATA ", data);
@@ -41,7 +42,8 @@ connectStart : number = 0;
addEventListener('app-family-invite-accepted', (data:any) => {
console.log("ACCEPT CALL DATA ", data); //connectData
- this.router.navigate(['familyconnectaction'], { state: data.connectData });
+ console.log("ACCEPT CALL DATA ACCEPTED", data.detail.data.message.connectData); //connectData
+ this.router.navigate(['familyconnectaction'], { state: data.detail.data.message.connectData });
this.initialInviteState();
});
}
diff --git a/src/app/pages/familyconnectaction/familyconnectaction.page.html b/src/app/pages/familyconnectaction/familyconnectaction.page.html
index 1fd10ed..4dcccfd 100644
--- a/src/app/pages/familyconnectaction/familyconnectaction.page.html
+++ b/src/app/pages/familyconnectaction/familyconnectaction.page.html
@@ -15,38 +15,36 @@
-
-
- Chat
-
-
-
-
-
-
-
-
-
-
- Send
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
{{item.name}} - {{item.when}}
+
{{item.message}}
+
+
+
diff --git a/src/app/pages/familyconnectaction/familyconnectaction.page.scss b/src/app/pages/familyconnectaction/familyconnectaction.page.scss
index e69de29..0fefb79 100644
--- a/src/app/pages/familyconnectaction/familyconnectaction.page.scss
+++ b/src/app/pages/familyconnectaction/familyconnectaction.page.scss
@@ -0,0 +1,22 @@
+.REC{
+ padding: 2px;
+ background-color: aliceblue;
+ border-radius: 10px;
+ margin-right: 50px;
+ margin-left: 5px;
+ margin-top: 5px;
+}
+.SND{
+ padding: 2px;
+ background-color: lightyellow;
+ border-radius: 10px;
+ margin-left: 50px;
+ margin-right: 5px;
+ margin-top: 5px;
+}
+.connect-card{
+ margin: 0px;
+ border-radius: 10px;
+ background: rgb(240,248,255);
+ background: linear-gradient(90deg, rgba(240,248,255,1) 0%, rgba(255,240,248,1) 35%, rgba(255,240,248,1) 100%);
+}
\ No newline at end of file
diff --git a/src/app/pages/familyconnectaction/familyconnectaction.page.ts b/src/app/pages/familyconnectaction/familyconnectaction.page.ts
index 1372df4..ea0318c 100644
--- a/src/app/pages/familyconnectaction/familyconnectaction.page.ts
+++ b/src/app/pages/familyconnectaction/familyconnectaction.page.ts
@@ -27,11 +27,12 @@ export class FamilyconnectactionPage implements OnInit {
console.log("ACCEPT CALL DATA MESSAGE ", data); //connectData
let newMsg = {
message : data.detail.data.message.chat_message,
- name : 'notset',
- when : '10-10-000'
+ name : data.detail.data.message.connectData.from.firstname,
+ when : '10-10-000',
+ how: 'REC'
}
this.charMessageHx.push( newMsg );
- debugger;
+ //debugger;
});
}
@@ -42,7 +43,15 @@ export class FamilyconnectactionPage implements OnInit {
}
sendMessage(){
if (this.chat_message !=''){
+ let newMsg = {
+ message : this.chat_message,
+ name : this.sessionDataProviderService.firstname,
+ when : '10-10-000',
+ how: 'SND'
+ }
+ this.charMessageHx.push( newMsg );
this.socketToolsService.familyConnectMessage(this.connnectionData, this.chat_message );
+ this.chat_message = '';
}
}
testEntry(){