{{leaveStatus}}
@@ -90,7 +92,7 @@
-
+
diff --git a/src/app/pages/chat/group-messages/group-messages.page.scss b/src/app/pages/chat/group-messages/group-messages.page.scss
index 4d9f6849f..d6d2e2fda 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.scss
+++ b/src/app/pages/chat/group-messages/group-messages.page.scss
@@ -14,7 +14,7 @@
padding: 30px 20px 0px 20px;
color:#000;
transform: translate3d(0, 1px, 0);
-
+
.header-top{
overflow: auto;
padding: 0 !important;
@@ -57,7 +57,7 @@
margin: 1px;
}
}
-
+
.title{
font-size: 25px;
}
@@ -71,7 +71,7 @@
.div-icon ion-icon{
float: right;
padding-left: 20px;
- }
+ }
}
}
ion-content{
@@ -123,6 +123,8 @@
font-size: 13px;
font-family: Roboto;
overflow: auto;
+ width: 100%;
+ //height: 100%;
.incoming-true, .incoming-false{
width: 305px;
@@ -143,7 +145,7 @@
}
.title{
color: #0782c9;
-
+
font-weight: bold;
margin-bottom: 5px;
@@ -176,9 +178,9 @@
.container{
justify-content: center;
justify-content: space-evenly;
-
+
}
-
+
.chat-icon-options{
display:block !important;
font-size: 25px;
@@ -205,5 +207,5 @@
align-self: center;
}
}
-
-}
\ No newline at end of file
+
+}
diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts
index 595cefe07..c9c331f2d 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, ElementRef, OnInit, ViewChild } from '@angular/core';
import { ActionSheetController, MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
import { AlertService } from 'src/app/services/alert.service';
import { AuthService } from 'src/app/services/auth.service';
@@ -30,6 +30,8 @@ export class GroupMessagesPage implements OnInit {
roomId: string;
loggedUserChat:any;
+ @ViewChild('scrollMe') private myScrollContainer: ElementRef;
+
constructor(
private menu: MenuController,
private modalController: ModalController,
@@ -51,8 +53,14 @@ export class GroupMessagesPage implements OnInit {
this.getRoomInfo();
}
- notImplemented(){
- this.alertService.presentAlert('Funcionalidade em desenvolvimento');
+ ngAfterViewChecked() {
+ this.scrollToBottom();
+ }
+
+ scrollToBottom(): void {
+ try {
+ this.myScrollContainer.nativeElement.scrollTop = this.myScrollContainer.nativeElement.scrollHeight;
+ } catch(err) { }
}
getRoomInfo(){
diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html
index 13dc07e08..1df0d7960 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -32,11 +32,12 @@
-
- {{message}} Esta conversa passou a grupo
- A conversa original mantêm-se como chat individual
-
-
+
+
+
+ Esta conversa passou a grupo
+ A conversa original mantêm-se como chat individual
+
diff --git a/src/app/shared/chat/group-messages/group-messages.page.scss b/src/app/shared/chat/group-messages/group-messages.page.scss
index cd36c3f60..46a69b6a8 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.scss
+++ b/src/app/shared/chat/group-messages/group-messages.page.scss
@@ -117,7 +117,8 @@
.messages{
font-size: 13px;
font-family: Roboto;
- overflow: auto;
+ width: 100%;
+ height: 100%;
.incoming-true, .incoming-false{
padding: 15px 20px;
diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts
index 698354ce5..ee81f6c15 100644
--- a/src/app/shared/chat/messages/messages.page.ts
+++ b/src/app/shared/chat/messages/messages.page.ts
@@ -45,7 +45,7 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
/* this.dm = this.navParams.get('dm'); */
}
ngOnChanges(changes: SimpleChanges): void {
- //this.load();
+ this.load();
//throw new Error('Method not implemented.');
}
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 9a6f9b6f9..4f006b22a 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -4,8 +4,8 @@
export const environment = {
production: false,
- /* apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V4/api/', */
- apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V4/api/',
+ apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V4/api/',
+ /* apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V4/api/', */
apiChatUrl: 'https://www.tabularium.pt/api/v1/',
/* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */
domain: 'gabinetedigital.local', //gabinetedigital.local