-
-
+
+
+
+
+
+
+ Apagar mensagem
+
+
+
{{msg.u.name}}
{{showDateDuration(msg._updatedAt)}}
{{msg.msg}}
+
+
+
+
+
+
+
+
+
+
+
+ {{file.title}}
+
+
+
+
+
+ {{file.description}}
+ •
+ {{msg.file.type.replace('application/','').toUpperCase()}}
+
+
+
+
+
{{last ? scrollToBottom() : ''}}
+
+
+
+
+
+
diff --git a/src/app/shared/chat/messages/messages.page.scss b/src/app/shared/chat/messages/messages.page.scss
index 657d5510a..127bf4a5c 100644
--- a/src/app/shared/chat/messages/messages.page.scss
+++ b/src/app/shared/chat/messages/messages.page.scss
@@ -151,7 +151,29 @@
margin-left: 10px;
float: right;
}
- }
+ }
+ .message{
+ .message-attachments{
+ .file{
+ align-items: center;
+
+ .file-details{
+ width: 100%;
+
+ .file-title{
+ color: #000;
+ text-decoration: underline;
+ white-space: nowrap;
+ overflow: hidden !important;
+ text-overflow: ellipsis !important;
+ }
+ .file-title:hover{
+ color: #0782c9;
+ }
+ }
+ }
+ }
+ }
}
ion-footer{
diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts
index 3e8bccfc4..525080d49 100644
--- a/src/app/shared/chat/messages/messages.page.ts
+++ b/src/app/shared/chat/messages/messages.page.ts
@@ -13,6 +13,7 @@ import { ChatOptionsFeaturesPage } from 'src/app/modals/chat-options-features/ch
import { ChatMessageStore } from 'src/app/store/chat/chat-message.service';
import { ChatUserStorage } from 'src/app/store/chat/chat-user.service';
import { TimeService } from 'src/app/services/functions/time.service';
+import { FileService } from 'src/app/services/functions/file.service';
@Component({
selector: 'app-messages',
@@ -49,6 +50,8 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
private scrollChangeCallback: () => void;
currentPosition: any;
startPosition: number;
+ mesageItemDropdownOptions: boolean = false;
+ scrollToBottomBtn = false;
constructor(
public popoverController: PopoverController,
@@ -61,6 +64,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
private toastService: ToastService,
private route: Router,
private timeService: TimeService,
+ private fileService: FileService,
) {
this.loggedUser = authService.ValidatedUserChat['data'];
@@ -120,6 +124,13 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
} catch(err) { }
}
+ scrollToBottomClicked(): void {
+ try {
+ this.myScrollContainer.nativeElement.scrollTop = this.myScrollContainer.nativeElement.scrollHeight;
+ //this.scrollingOnce = false;
+ } catch(err) { }
+ }
+
ngAfterViewInit() {
this.scrollChangeCallback = () => this.onContentScrolled(event);
window.addEventListener('scroll', this.scrollChangeCallback, true);
@@ -128,14 +139,21 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
onContentScrolled(e) {
this.startPosition = e.srcElement.scrollTop;
let scroll = e.srcElement.scrollTop;
+ let windowHeight = e.srcElement.scrollHeight;
+ let containerHeight = windowHeight - e.srcElement.clientHeight;
+
if (scroll > this.currentPosition) {
- //this.showButton = false;
//alert('BOTTOM');
} else {
- //this.showButton = true;
//alert('UP');
this.scrollingOnce = false;
}
+ if((containerHeight - 100) > scroll){
+ this.scrollToBottomBtn = true;
+ }
+ else{
+ this.scrollToBottomBtn = false;
+ }
this.currentPosition = scroll;
}
@@ -191,6 +209,10 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
})
}
+ viewDocument(url:string){
+ this.fileService.viewDocumentByUrl(url);
+ }
+
getChatMembers() {
console.log(this.roomId);
@@ -350,44 +372,67 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
}
this.openNewEventPage.emit(data);
}
+ else if(res['data'] == 'take-picture'){
+ this.fileService.addCameraPictureToChat(this.roomId);
+ //this.loadPicture();
+ }
+ else if(res['data'] == 'add-picture'){
+ this.fileService.addPictureToChat(this.roomId);
+ //this.loadPicture();
+ }
+ else if(res['data'] == 'add-document'){
+ this.fileService.addDocumentToChat(this.roomId);
+ //this.loadDocument();
+ }
+ else if(res['data'] == 'documentoGestaoDocumental'){
+
+ this.fileService.addDocGestaoDocumentalToChat(this.roomId);
+ this.showLoader = false;
+ //this.addDocGestaoDocumental();
+ }
+ this.loadMessages();
});
}
async serverLongPull() {
- const roomId = this.roomId
- this.chatService.getRoomMessages(this.roomId).subscribe(async res => {
+ const roomId = this.roomId;
- if (res == 502) {
- // Connection timeout
- // happens when the connection was pending for too long
- // let's reconnect
- await this.serverLongPull();
- } else if (res != 200) {
+ this.chatService.getRoomMessages(this.roomId).subscribe(async res => {
+ console.log(res['success']);
+
+
+ if (res['success'] == true) {
// Show Error
//showMessage(response.statusText);
//this.loadMessages()
this.messages = res['messages'].reverse();
this.chatMessageStore.add(roomId, this.messages)
+
console.log(this.messages);
// Reconnect in one second
if(this.route.url != "/home/chat"){
console.log("Timer message stop")
- } else {
- if(document.querySelector('app-messages')){
- await new Promise(resolve => setTimeout(resolve, 5000));
- await this.serverLongPull();
- this.getDirectMessages.emit();
- console.log('Timer message running')
- }
}
- } else {
+ else{
+ if(document.querySelector('app-messages')){
+ await new Promise(resolve => setTimeout(resolve, 5000));
+ await this.serverLongPull();
+ this.getDirectMessages.emit();
+ console.log('Timer message running')
+ }
+ }
+ } /* else {
// Got message
//let message = await response.text();
//this.loadMessages()
await this.serverLongPull();
- }
+ } */
+ }, (error)=>{
+ console.log(error);
+ this.serverLongPull();
+
});
}
diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html
index 733469865..9a1c3a09a 100644
--- a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html
+++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html
@@ -8,9 +8,9 @@
-
+
-
+
diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts
index ef47957ae..7aea36628 100644
--- a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts
+++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts
@@ -47,19 +47,28 @@ export class ChatOptionsPopoverPage implements OnInit {
takePicture(){
if( window.innerWidth < 701){
- this.popoverController.dismiss('takePicture');
+ this.popoverController.dismiss('take-picture');
}
else{
- this.modalController.dismiss('takePicture');
+ this.modalController.dismiss('take-picture');
}
}
anexarFoto(){
if( window.innerWidth < 701){
- this.popoverController.dismiss('loadPicture');
+ this.popoverController.dismiss('add-picture');
}
else{
- this.modalController.dismiss('loadPicture');
+ this.modalController.dismiss('add-picture');
+ }
+ }
+
+ addDocGestaoDocumental(){
+ if( window.innerWidth < 701){
+ this.popoverController.dismiss('documentoGestaoDocumental');
+ }
+ else{
+ this.modalController.dismiss('documentoGestaoDocumental');
}
}
@@ -97,6 +106,7 @@ export class ChatOptionsPopoverPage implements OnInit {
}
} */
+
async getDoc(){
const modal = await this.modalController.create({
component: SearchPage,
diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.ts b/src/app/shared/popover/chat-popover/chat-popover.page.ts
index ca1d0742b..20ee26e35 100644
--- a/src/app/shared/popover/chat-popover/chat-popover.page.ts
+++ b/src/app/shared/popover/chat-popover/chat-popover.page.ts
@@ -111,8 +111,12 @@ export class ChatPopoverPage implements OnInit {
}
async openChangeGroupName(){
- this.popoverController.dismiss('edit');
- this.modalController.dismiss('edit');
+ if( window.innerWidth < 701){
+ this.popoverController.dismiss('edit');
+ }
+ else{
+ this.modalController.dismiss('edit');
+ }
}
}
diff --git a/src/assets/icon/webtrix.svg b/src/assets/icon/webtrix.svg
new file mode 100644
index 000000000..fcf80f480
--- /dev/null
+++ b/src/assets/icon/webtrix.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/images/pdf.png b/src/assets/images/pdf.png
new file mode 100644
index 000000000..c556019cb
Binary files /dev/null and b/src/assets/images/pdf.png differ
diff --git a/src/assets/images/webtrix-logo.png b/src/assets/images/webtrix-logo.png
new file mode 100644
index 000000000..94498f472
Binary files /dev/null and b/src/assets/images/webtrix-logo.png differ
diff --git a/src/global.scss b/src/global.scss
index 2a84f519e..39e43b04a 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -1072,6 +1072,95 @@ ngx-mat-datetime-content{
}
}
+.messages{
+ .messages-list-item-wrapper{
+ .message-item{
+ .message-item-options{
+ .message-options-icon{
+ display: none;
+ padding-left: 10px;
+ padding-right: 0px;
+ position: absolute;
+ //background-color: red;
+
+ //box-shadow: rgba(0, 30, 0, 0.15) 1.95px 1.95px 2.6px;
+ }
+ .mesage-item-dropdown-options{
+ display: none;
+ margin-top: 15px;
+ position: absolute;
+ border: 1px solid red;
+ }
+ }
+
+ .title{
+ //border: 1px solid blue;
+ }
+ }
+ .incoming-true:hover{
+ .message-options-icon{
+ display: block;
+ background-color: #ebebeb;
+ }
+ }
+ .incoming-false:hover{
+ .message-options-icon{
+ display: block;
+ background-color: #e4f4fe;
+ }
+ }
+ }
+}
+
+.message-attachments{
+ border-radius: 5px;
+ background-color: #42b9fe13;
+ padding: 1px;
+ .file{
+ ion-thumbnail{
+ --size: 20px;
+ }
+ .file-details{
+ max-width: calc(100% - 20px);
+ padding-left: 5px;
+
+ .file-title:hover{
+ color: #0782c9;
+ text-decoration: underline;
+ }
+
+ span{
+ white-space: nowrap;
+ overflow: hidden !important;
+ text-overflow: ellipsis !important;
+ }
+ }
+ }
+ .file-details-optional{
+ font-size: xx-small;
+ padding-left: 5px;
+ }
+}
+
+.file-icon{
+ color: #b2b2b2;
+}
+.set-active-item-font-to-white{
+ color: #fff;
+}
+.pdf-icon{
+ color: #a40404;
+}
+.word-icon{
+ color: #295497;
+}
+.excel-icon{
+ color: #1f7244;
+}
+.powerpoint-icon{
+ color: #d24726;
+}
+
@media only screen and (min-width: 665px) {
.loading-blocker {
diff --git a/src/index.html b/src/index.html
index af50de71c..fb77a3f7a 100644
--- a/src/index.html
+++ b/src/index.html
@@ -9,6 +9,7 @@
+
@@ -47,7 +48,7 @@
-
+
@@ -56,7 +57,7 @@
-
+
-