diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts index 028e894fc..c9343aaff 100644 --- a/src/app/services/chat/message.service.ts +++ b/src/app/services/chat/message.service.ts @@ -66,7 +66,6 @@ export class MessageService { messageModelInstance: MessageModel attachmentsModelData: any - dateLabel = false; constructor( diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts index 1bcf83387..15cb34dc5 100644 --- a/src/app/services/chat/room.service.ts +++ b/src/app/services/chat/room.service.ts @@ -725,24 +725,12 @@ export class RoomService { const messages = await MessageModel.filter({rid:this.id}).execute() - - console.log('MessageModel', messages) for (let ChatMessage of messages) { const wewMessage = await this.simplePrepareMessage(ChatMessage) - console.log('MessageModel 22', wewMessage) - - const currentMessageDate = this.formatDateToDDMMYYYY(ChatMessage._updatedAt) - if(!this.dateLabel.includes(currentMessageDate) ) { - this.dateLabel.push(currentMessageDate); - - wewMessage.msg = currentMessageDate - wewMessage.dateLabel = true; - this.messages.push(wewMessage) - } wewMessage.from = 'Offline' wewMessage.loadHistory = this.hasLoadHistory @@ -752,7 +740,6 @@ export class RoomService { const message = await this.prepareCreate({message:ChatMessage}) - console.log('MessageModel 33', messages) message.from = 'Offline' message.loadHistory = this.hasLoadHistory @@ -763,8 +750,6 @@ export class RoomService { const offlineMessage = await this.prepareCreate({message:ChatMessage}) - console.log('MessageModel 44', offlineMessage) - offlineMessage.from = 'Offline' offlineMessage.loadHistory = this.hasLoadHistory wewMessage.messageModelInstance = ChatMessage diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html index 4f511fbf5..165bd22d4 100644 --- a/src/app/shared/chat/messages/messages.page.html +++ b/src/app/shared/chat/messages/messages.page.html @@ -39,7 +39,7 @@
-
+
diff --git a/src/app/shared/chat/messages/messages.page.scss b/src/app/shared/chat/messages/messages.page.scss index 20779a145..362684b35 100644 --- a/src/app/shared/chat/messages/messages.page.scss +++ b/src/app/shared/chat/messages/messages.page.scss @@ -314,11 +314,6 @@ ion-footer { padding-left: 10px; } -.dateLabel { - background: #000 !important; - margin: 0 auto; -} - .float-status { position: relative !important; float: right; diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts index 0fd42c917..7af54ef91 100644 --- a/src/app/shared/chat/messages/messages.page.ts +++ b/src/app/shared/chat/messages/messages.page.ts @@ -1,4 +1,4 @@ -import { AfterViewInit, ChangeDetectorRef, Component, ElementRef, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges, ViewChild } from '@angular/core'; +import { AfterViewInit, Component, ElementRef, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges, ViewChild } from '@angular/core'; import { AnimationController, GestureController, IonRange, ModalController, PopoverController } from '@ionic/angular'; import { ChatService } from 'src/app/services/chat.service'; import { ToastService } from 'src/app/services/toast.service'; @@ -100,8 +100,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy roomName: any; isAdmin = false; roomCountDownDate: string; - groupedMessages: { date: string; messages: any[] }[] = []; - msgArray: any = new Array(); constructor( @@ -124,7 +122,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy private platform: Platform, private fileOpener: FileOpener, public p: PermissionService, - private cdr: ChangeDetectorRef ) { // update this.checkAudioPermission() @@ -141,8 +138,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy this.showAvatar = false - this.msgArray = this.ChatSystemService.getDmRoom(this.roomId).messages; - diff --git a/version/git-version.ts b/version/git-version.ts index d1341ec73..3d5ff4945 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "42c2fc92f", - "SHA": "42c2fc92ffbe3543abe904e1d8ba6a53fb47e462", + "shortSHA": "f1717f71c", + "SHA": "f1717f71cce09e76f6c4a558ef58d912b0f588b0", "branch": "developer-prod", "lastCommitAuthor": "'Eudes InĂ¡cio'", - "lastCommitTime": "'Sat Sep 9 14:40:08 2023 +0100'", - "lastCommitMessage": "upload profile picture", - "lastCommitNumber": "5258", + "lastCommitTime": "'Mon Sep 11 21:14:00 2023 +0100'", + "lastCommitMessage": "dateLabel added to chat web", + "lastCommitNumber": "5259", "change": "", - "changeStatus": "On branch developer-prod\nYour branch is up to date with 'origin/developer-prod'.\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: android/app/src/main/AndroidManifest.xml\n\tmodified: src/app/services/chat/message.service.ts\n\tmodified: src/app/services/chat/room.service.ts\n\tmodified: src/app/shared/chat/messages/messages.page.html\n\tmodified: src/app/shared/chat/messages/messages.page.scss\n\tmodified: src/app/shared/chat/messages/messages.page.ts", + "changeStatus": "On branch developer-prod\nYour branch is up to date with 'origin/developer-prod'.\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/services/chat/message.service.ts\n\tmodified: src/app/services/chat/room.service.ts\n\tmodified: src/app/shared/chat/messages/messages.page.html\n\tmodified: src/app/shared/chat/messages/messages.page.scss\n\tmodified: src/app/shared/chat/messages/messages.page.ts", "changeAuthor": "eudes.inacio" } \ No newline at end of file