This commit is contained in:
tiago.kayaya
2022-01-13 13:45:04 +01:00
parent e2e3067bf5
commit f54beff851
5 changed files with 6 additions and 9 deletions
+2 -1
View File
@@ -118,7 +118,8 @@
(click)="openGroupMessagesPage(group.value.id)" class="item-content flex-grow-1 cursor-pointer">
<div class="item-title-time">
<div class="item-title" [class.item-title-active]="group.value.id ==idSelected">
<ion-label>{{group.value.name.split('-').join(' ')}}</ion-label>
{{group.value.name.split('-').join(' ')}}
<ion-label>{{group.value.name.split('-').join(' ')}}</ion-label>TT
</div>
<div class="item-date" [class.item-date-active]="group.value.id ==idSelected" *ngIf="group.value.lastMessage && !group.customFields.countDownDate">{{showDateDuration(group._updatedAt)}}</div>
<div class="item-date" [class.item-date-active]="group.value.id ==idSelected" *ngIf="group.value.customFields.countDownDate">{{countDownDate(group.value.customFields.countDownDate, group.value.id)}}</div>
-2
View File
@@ -32,7 +32,6 @@ import { ThemeService } from 'src/app/services/theme.service'
import { DataService } from 'src/app/services/data.service';
import { SqliteService } from 'src/app/services/sqlite.service';
import { StorageService } from 'src/app/services/storage.service';
import { WebsocketService } from 'src/app/services/websocket.service';
@@ -40,7 +39,6 @@ import { WebsocketService } from 'src/app/services/websocket.service';
selector: 'app-chat',
templateUrl: './chat.page.html',
styleUrls: ['./chat.page.scss'],
providers: [WebsocketService, ChatService]
})
export class ChatPage implements OnInit {
-2
View File
@@ -8,7 +8,6 @@ import { environment } from 'src/environments/environment';
import { Storage } from '@ionic/storage';
import { Message } from 'src/app/models/message.model';
import { Observable, Subject } from "rxjs/Rx";
import { WebsocketService } from './websocket.service';
@Injectable({
providedIn: 'root'
@@ -31,7 +30,6 @@ export class ChatService {
private authService: AuthService,
private storage: Storage,
private storageService:StorageService,
private wsService: WebsocketService,
)
{
this.loggedUserChat = authService.ValidatedUserChat;
+3 -3
View File
@@ -13,11 +13,11 @@ export class RoomService {
chatUser: ChatUserService[] = []
id = ''
name = ''
name = 'teste'
_updatedAt = {}
private hasLoadHistory = false
duration = ''
constructor(
public WsChatService: WsChatService,
@@ -61,7 +61,7 @@ export class RoomService {
this.WsChatService.loadHistory(this.id, limit).then((message:any) => {
console.log('loadHistory', message)
message.result.messages.reverse().forEach(element => {
console.log('element', element)
element = this.fix_updatedAt(element)
@@ -113,7 +113,7 @@ export class WsChatMethodsService {
}
private isIndividual(roomData) {
return !roomData.fname
return roomData.t == "d";
}
}