mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
Remove my alteration of chat changes
This commit is contained in:
@@ -66,7 +66,6 @@ export class MessageService {
|
|||||||
|
|
||||||
messageModelInstance: MessageModel
|
messageModelInstance: MessageModel
|
||||||
attachmentsModelData: any
|
attachmentsModelData: any
|
||||||
dateLabel = false;
|
|
||||||
|
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
|
|||||||
@@ -725,24 +725,12 @@ export class RoomService {
|
|||||||
|
|
||||||
const messages = await MessageModel.filter({rid:this.id}).execute()
|
const messages = await MessageModel.filter({rid:this.id}).execute()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
console.log('MessageModel', messages)
|
console.log('MessageModel', messages)
|
||||||
|
|
||||||
for (let ChatMessage of messages) {
|
for (let ChatMessage of messages) {
|
||||||
|
|
||||||
|
|
||||||
const wewMessage = await this.simplePrepareMessage(ChatMessage)
|
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.from = 'Offline'
|
||||||
wewMessage.loadHistory = this.hasLoadHistory
|
wewMessage.loadHistory = this.hasLoadHistory
|
||||||
@@ -752,7 +740,6 @@ export class RoomService {
|
|||||||
|
|
||||||
const message = await this.prepareCreate({message:ChatMessage})
|
const message = await this.prepareCreate({message:ChatMessage})
|
||||||
|
|
||||||
console.log('MessageModel 33', messages)
|
|
||||||
|
|
||||||
message.from = 'Offline'
|
message.from = 'Offline'
|
||||||
message.loadHistory = this.hasLoadHistory
|
message.loadHistory = this.hasLoadHistory
|
||||||
@@ -763,8 +750,6 @@ export class RoomService {
|
|||||||
|
|
||||||
const offlineMessage = await this.prepareCreate({message:ChatMessage})
|
const offlineMessage = await this.prepareCreate({message:ChatMessage})
|
||||||
|
|
||||||
console.log('MessageModel 44', offlineMessage)
|
|
||||||
|
|
||||||
offlineMessage.from = 'Offline'
|
offlineMessage.from = 'Offline'
|
||||||
offlineMessage.loadHistory = this.hasLoadHistory
|
offlineMessage.loadHistory = this.hasLoadHistory
|
||||||
wewMessage.messageModelInstance = ChatMessage
|
wewMessage.messageModelInstance = ChatMessage
|
||||||
|
|||||||
@@ -39,7 +39,7 @@
|
|||||||
|
|
||||||
<div class="messages-list-item-wrapper container-width-100"
|
<div class="messages-list-item-wrapper container-width-100"
|
||||||
*ngFor="let msg of ChatSystemService.getDmRoom(roomId).messages; index as i; let last = last">
|
*ngFor="let msg of ChatSystemService.getDmRoom(roomId).messages; index as i; let last = last">
|
||||||
<div class='message-item incoming-{{msg.u.username!=sessionStore.user.UserName}} max-width-45' *ngIf="msg.msg !=''" [class.dateLabel] = "msg.dateLabel">
|
<div class='message-item incoming-{{msg.u.username!=sessionStore.user.UserName}} max-width-45' *ngIf="msg.msg !=''">
|
||||||
<div class="message-item-options d-flex justify-content-end">
|
<div class="message-item-options d-flex justify-content-end">
|
||||||
<fa-icon [matMenuTriggerFor]="beforeMenu" icon="chevron-down" class="message-options-icon cursor-pointer">
|
<fa-icon [matMenuTriggerFor]="beforeMenu" icon="chevron-down" class="message-options-icon cursor-pointer">
|
||||||
</fa-icon>
|
</fa-icon>
|
||||||
|
|||||||
@@ -314,11 +314,6 @@ ion-footer {
|
|||||||
padding-left: 10px;
|
padding-left: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.dateLabel {
|
|
||||||
background: #000 !important;
|
|
||||||
margin: 0 auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
.float-status {
|
.float-status {
|
||||||
position: relative !important;
|
position: relative !important;
|
||||||
float: right;
|
float: right;
|
||||||
|
|||||||
@@ -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 { AnimationController, GestureController, IonRange, ModalController, PopoverController } from '@ionic/angular';
|
||||||
import { ChatService } from 'src/app/services/chat.service';
|
import { ChatService } from 'src/app/services/chat.service';
|
||||||
import { ToastService } from 'src/app/services/toast.service';
|
import { ToastService } from 'src/app/services/toast.service';
|
||||||
@@ -100,8 +100,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
|
|||||||
roomName: any;
|
roomName: any;
|
||||||
isAdmin = false;
|
isAdmin = false;
|
||||||
roomCountDownDate: string;
|
roomCountDownDate: string;
|
||||||
groupedMessages: { date: string; messages: any[] }[] = [];
|
|
||||||
msgArray: any = new Array();
|
|
||||||
|
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
@@ -124,7 +122,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
|
|||||||
private platform: Platform,
|
private platform: Platform,
|
||||||
private fileOpener: FileOpener,
|
private fileOpener: FileOpener,
|
||||||
public p: PermissionService,
|
public p: PermissionService,
|
||||||
private cdr: ChangeDetectorRef
|
|
||||||
) {
|
) {
|
||||||
// update
|
// update
|
||||||
this.checkAudioPermission()
|
this.checkAudioPermission()
|
||||||
@@ -141,8 +138,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
|
|||||||
|
|
||||||
this.showAvatar = false
|
this.showAvatar = false
|
||||||
|
|
||||||
this.msgArray = this.ChatSystemService.getDmRoom(this.roomId).messages;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
export let versionData = {
|
export let versionData = {
|
||||||
"shortSHA": "42c2fc92f",
|
"shortSHA": "f1717f71c",
|
||||||
"SHA": "42c2fc92ffbe3543abe904e1d8ba6a53fb47e462",
|
"SHA": "f1717f71cce09e76f6c4a558ef58d912b0f588b0",
|
||||||
"branch": "developer-prod",
|
"branch": "developer-prod",
|
||||||
"lastCommitAuthor": "'Eudes Inácio'",
|
"lastCommitAuthor": "'Eudes Inácio'",
|
||||||
"lastCommitTime": "'Sat Sep 9 14:40:08 2023 +0100'",
|
"lastCommitTime": "'Mon Sep 11 21:14:00 2023 +0100'",
|
||||||
"lastCommitMessage": "upload profile picture",
|
"lastCommitMessage": "dateLabel added to chat web",
|
||||||
"lastCommitNumber": "5258",
|
"lastCommitNumber": "5259",
|
||||||
"change": "",
|
"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 <file>...\" 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 <file>...\" 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"
|
"changeAuthor": "eudes.inacio"
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user