Merge branch 'feature/websocket' of https://bitbucket.org/equilibriumito/gabinete-digital into feature/websocket

src/app/services/chat/ws-chat-methods.service.ts

@@ -3,7 +3,8 @@ import { RoomService } from './room.service';
 import { WsChatService } from 'src/app/services/chat/ws-chat.service';
 import { MessageService } from 'src/app/services/chat/message.service'
 import { SessionStore } from 'src/app/store/session.service';
-
+import { capitalizeTxt } from 'src/plugin/text'
+import { Rooms, Update as room } from 'src/app/models/chatMethod';
 
 @Injectable({
   providedIn: 'root'
@@ -34,11 +35,11 @@ export class WsChatMethodsService {
   async getAllRooms () {
     this.loadingWholeList = true
 
-    const rooms: any = await this.WsChatService.getRooms();
+    const rooms = await this.WsChatService.getRooms();
 
-    console.log("ROOMS" + rooms)
+    // console.log("ROOMS" + JSON.stringify(rooms))
 
-    rooms.result.update.forEach((roomData:any) => {
+    rooms.result.update.forEach((roomData: room) => {
       let room:RoomService;
 
       console.log(roomData);
@@ -64,8 +65,11 @@ export class WsChatMethodsService {
         this.groupCount++
       }
 
+
+
     });
 
+    console.log('this.group', this.group)
     this.loadingWholeList = false
   }
 
@@ -91,29 +95,31 @@ export class WsChatMethodsService {
     }
   }
 
-  getRoomName(roomData) {
+  getRoomName(roomData: room) {
     if(this.isIndividual(roomData)) {
       const names: String[] = roomData.usernames
       const roomName = names.filter((name)=>{
         return name != SessionStore.user.RochetChatUser
       })[0]
 
-      return roomName
+      const firstName = capitalizeTxt(roomName.split('.')[0])
+      const lastName =  capitalizeTxt(roomName.split('.')[1])
+      return firstName + ' ' + lastName
     } else {
       return roomData.fname
     }
   }
 
-  getRoomId(roomData) {
+  getRoomId(roomData:room) {
     return roomData.lastMessage.rid
   }
 
-  getRoomLastMessage(roomData) {
+  getRoomLastMessage(roomData: room) {
     return roomData.lastMessage
   }
 
-  private isIndividual(roomData) {
-    return roomData.t == "d";
+  private isIndividual(roomData: room) {
+    return !roomData.fname
   }
 
 }