save

2026-04-18 20:47:54 +00:00 · 2022-01-12 14:48:17 +01:00
parent 60f63d6e7f
commit e2e3067bf5
8 changed files with 39 additions and 169 deletions
@@ -17,9 +17,6 @@
              <ion-label class="title">Chat</ion-label>
            </div>
            <div class="div-icon">
-              <button class="btn-no-color" (click)="sendMsg()">
-                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src="assets/images/theme/gov/icons-chat-new-conversation.svg"></ion-icon>
-              </button>
              <button class="btn-no-color" (click)="openContactsPage()">
                <ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src="assets/images/icons-chat-new-conversation.svg"></ion-icon>
                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src="assets/images/theme/gov/icons-chat-new-conversation.svg"></ion-icon>
@@ -84,7 +81,7 @@
                          <fa-icon icon="image" class="file-icon" [class.set-active-item-font-to-white]="room.value.id == idSelected"></fa-icon>
                          <span> Fotografia</span>
                        </div>
-                      </ion-label> 
+                      </ion-label>
                    </div>
                  </div>
                </div>
@@ -106,36 +103,36 @@
            </ion-item-sliding>
          </ion-list>
          <ion-list *ngSwitchCase="'Grupos'">
-              <ion-item-sliding *ngIf="!showLoader">
-                  <div *ngFor="let group of allGroups"
-                  [class.item-active]="group._id ==idSelected"
+              <ion-item-sliding *ngIf="!wsChatMethodsService.loadingWholeList">
+                  <div *ngFor="let group of wsChatMethodsService.group | keyvalue"
+                  [class.item-active]="group.value.id ==idSelected"
                  class="item item-hover d-flex">
                    <div class="item-icon">
                      <!-- <ion-icon class="icon" slot="start" src="assets/images/icons-chat-group-chat-40.svg"></ion-icon> -->

                      <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon" slot="start" src="assets/images/icons-chat-group-chat-40.svg"></ion-icon>
-                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && group._id != idSelected " class="icon" slot="start" src="assets/images/theme/gov/icons-chat-group-chat-40.svg"></ion-icon>
-                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && group._id == idSelected " class="icon" slot="start" src="assets/images/theme/gov/icons-chat-group-chat-40-hover.svg"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && group.value.id != idSelected " class="icon" slot="start" src="assets/images/theme/gov/icons-chat-group-chat-40.svg"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && group.value.id == idSelected " class="icon" slot="start" src="assets/images/theme/gov/icons-chat-group-chat-40-hover.svg"></ion-icon>
                    </div>
                    <div
-                     (click)="openGroupMessagesPage(group._id)" class="item-content flex-grow-1 cursor-pointer">
+                     (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._id ==idSelected">
-                          <ion-label>{{group.name.split('-').join(' ')}}</ion-label>
+                        <div class="item-title" [class.item-title-active]="group.value.id ==idSelected">
+                          <ion-label>{{group.value.name.split('-').join(' ')}}</ion-label>
                        </div>
-                        <div class="item-date" [class.item-date-active]="group._id ==idSelected" *ngIf="group.lastMessage && !group.customFields.countDownDate">{{showDateDuration(group._updatedAt)}}</div>
-                        <div class="item-date" [class.item-date-active]="group._id ==idSelected" *ngIf="group.customFields.countDownDate">{{countDownDate(group.customFields.countDownDate, group._id)}}</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>
                      </div>
-                      <div *ngIf="group.lastMessage" class="item-description d-flex align-items-center" [class.item-description-active]="group._id ==idSelected">
-                        <div class="item-message">{{group.lastMessage.u.name}}: {{group.lastMessage.msg}} </div>
-                        <div class="item-files add-ellipsis" *ngIf="group.lastMessage.file">
-                          <fa-icon *ngIf="group.lastMessage.file.type != 'application/meeting'" icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="group._id == idSelected"></fa-icon>
-                          <fa-icon *ngIf="group.lastMessage.file.type == 'application/meeting'" icon="calendar-alt" class="file-icon" [class.set-active-item-font-to-white]="group._id == idSelected"></fa-icon>
-                          <span class="item-files-title"> {{group.lastMessage.file.name || group.lastMessage.file.subject}}</span>
+                      <div *ngIf="group.value.lastMessage" class="item-description d-flex align-items-center" [class.item-description-active]="group.value.id ==idSelected">
+                        <div class="item-message">{{group.value.lastMessage.u.name}}: {{group.lastMessage.msg}} </div>
+                        <div class="item-files add-ellipsis" *ngIf="group.value.lastMessage.file">
+                          <fa-icon *ngIf="group.value.lastMessage.file.type != 'application/meeting'" icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="group.value.id == idSelected"></fa-icon>
+                          <fa-icon *ngIf="group.value.lastMessage.file.type == 'application/meeting'" icon="calendar-alt" class="file-icon" [class.set-active-item-font-to-white]="group.value.id == idSelected"></fa-icon>
+                          <span class="item-files-title"> {{group.value.lastMessage.file.name || group.value.lastMessage.file.subject}}</span>
                        </div>
-                        <div  class="item-files" *ngIf="group.lastMessage.attachments">
-                          <div *ngIf="group.lastMessage.attachments[0].image_url">
-                            <fa-icon icon="image" class="file-icon" [class.set-active-item-font-to-white]="group._id == idSelected"></fa-icon>
+                        <div  class="item-files" *ngIf="group.value.lastMessage.attachments">
+                          <div *ngIf="group.value.value.lastMessage.attachments[0].image_url">
+                            <fa-icon icon="image" class="file-icon" [class.set-active-item-font-to-white]="group.value.id == idSelected"></fa-icon>
                            <span> Fotografia</span>
                          </div>
                        </div>
@@ -143,7 +140,7 @@
                    </div>
                  </div>
              </ion-item-sliding>
-              <ion-item-sliding *ngIf="showLoader || allGroups.length < 1">
+              <ion-item-sliding *ngIf="wsChatMethodsService.loadingWholeList || wsChatMethodsService.groupCount">
                <div *ngFor="let n of numSequence(8); let i = index;" class="item item-hover width-100 d-flex ion-no-padding ion-no-margin">
                  <div class="item-icon"><ion-icon class="icon" slot="start" src="assets/icon/icons-group-chat-grey.svg"></ion-icon></div>
                  <div class="item-content flex-grow-1 cursor-pointer">
@@ -12,7 +12,7 @@ import {
 import { ModalController, Platform } from '@ionic/angular';
 import { AuthService } from 'src/app/services/auth.service';
 import { ChatService } from 'src/app/services/chat.service';
-import { wsChatMethodsService as wsChatMethodsService} from 'src/app/services/chat/chat.service'
+import { WsChatMethodsService} from 'src/app/services/chat/ws-chat-methods.service'
 import { GroupMessagesPage } from './group-messages/group-messages.page';
 import { ContactsPage } from './messages/contacts/contacts.page';
 import { MessagesPage } from './messages/messages.page';
@@ -127,7 +127,7 @@ export class ChatPage implements OnInit {
    private sqlservice: SqliteService,
    private platform: Platform,
    private storageservice: StorageService,
-    public wsChatMethodsService: wsChatMethodsService
+    public wsChatMethodsService: WsChatMethodsService,
  ) {

    this.loggedUserChat = authService.ValidatedUserChat['data'];
@@ -28,7 +28,7 @@ import { SqliteService } from 'src/app/services/sqlite.service';
 import { elementAt } from 'rxjs-compat/operator/elementAt';
 import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
 import { ViewEventPage } from 'src/app/modals/view-event/view-event.page';
-import { wsChatMethodsService } from 'src/app/services/chat/chat.service'
+import { WsChatMethodsService } from 'src/app/services/chat/ws-chat-methods.service'

 const IMAGE_DIR = 'stored-images';

@@ -96,7 +96,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
    private changeDetectorRef: ChangeDetectorRef,
    private platform: Platform,
    private sqlservice: SqliteService,
-    public wsChatMethodsService: wsChatMethodsService
+    public wsChatMethodsService: WsChatMethodsService
  ) {
    this.loggedUser = authService.ValidatedUserChat['data'];
    this.roomId = this.navParams.get('roomId');
@@ -42,7 +42,7 @@ export class ChatService {
        headers: this.headers,
      };

-      console.log("CHAT SERVICE");
+      /* console.log("CHAT SERVICE");

      wsService.messages = <Subject<any>>this.wsService
      .connect(environment.apiWsChatUrl)
@@ -79,7 +79,7 @@ export class ChatService {
          return (JSON.stringify(data));
        });

-        console.log(wsService.messages);
+        console.log(wsService.messages) */;

    }

@@ -1,16 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { wsChatMethodsService } from './chat.service';
-
-describe('ChatService', () => {
-  let service: wsChatMethodsService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(wsChatMethodsService);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});
@@ -1,114 +0,0 @@
-import { Injectable } from '@angular/core';
-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';
-
-@Injectable({
-  providedIn: 'root'
-})
-export class wsChatMethodsService {
-
-
-  dm: {[key: string]:  RoomService} = {}
-  group: {[key: string]:  RoomService} = {}
-
-  loadingWholeList = false
-
-  dmCount = 0;
-  groupCount = 0;
-  
-  constructor(
-    private WsChatService: WsChatService
-  ) {
-
-    (async()=>{
-      await this.getAllRooms();
-      this.subscribeToRoom()
-    })()
-    
-  }
-
-  async getAllRooms () {
-    this.loadingWholeList = true
-
-    const rooms: any = await this.WsChatService.getRooms();
-
-    console.log(rooms)
-
-    rooms.result.update.forEach((roomData:any) => {
-      let room:RoomService;
-      
-      room = new RoomService(this.WsChatService, new MessageService())
-      room.setData({
-        id: this.getRoomId(roomData),
-        name: this.getRoomName(roomData),
-        lastMessage: this.getRoomLastMessage(roomData),
-        _updatedAt: roomData._updatedAt['$date']
-      })
-
-      room.receiveMessage()
-
-      let roomId = roomData.lastMessage.rid
-
-      if(this.isIndividual(roomData)) {
-        this.dm[roomId] = room
-        this.dmCount++
-      } else {
-        this.group[roomId] = room
-        this.groupCount++
-      }
-      
-    });
-
-    this.loadingWholeList = false
-  }
-
-  subscribeToRoom() {
-    for (const id in this.dm) {
-      this.WsChatService.subscribeNotifyRoom(id).then((subscription)=>{
-        console.log('subscription', subscription)
-      })
-    }
-
-    for (const id in this.group) {
-      this.WsChatService.subscribeNotifyRoom(id).then((subscription)=>{
-        console.log('subscription', subscription)
-      })
-    }
-  }
-
-  getRoom(id): RoomService {
-    try {
-      return this.dm[id]
-    } catch(e) {
-      return this.group[id]
-    }
-  }
-
-  getRoomName(roomData) {
-    if(this.isIndividual(roomData)) {
-      const names: String[] = roomData.usernames
-      const roomName = names.filter((name)=>{
-        return name != SessionStore.user.RochetChatUser
-      })[0]
-
-      return roomName
-    } else {
-      return roomData.fName
-    }
-  }
-
-  getRoomId(roomData) {
-    return roomData.lastMessage.rid
-  }
-
-  getRoomLastMessage(roomData) {
-    return roomData.lastMessage
-  }
-
-  private isIndividual(roomData) {
-    return !roomData.fname
-  }
-
-}
@@ -19,7 +19,7 @@ export class WsChatMethodsService {

  dmCount = 0;
  groupCount = 0;
-  
+
  constructor(
    private WsChatService: WsChatService
  ) {
@@ -28,7 +28,7 @@ export class WsChatMethodsService {
      await this.getAllRooms();
      this.subscribeToRoom()
    })()
-    
+
  }

  async getAllRooms () {
@@ -36,11 +36,14 @@ export class WsChatMethodsService {

    const rooms: any = await this.WsChatService.getRooms();

-    console.log(rooms)
+    console.log("ROOMS" + rooms)

    rooms.result.update.forEach((roomData:any) => {
      let room:RoomService;
-      
+
+      console.log(roomData);
+
+
      room = new RoomService(this.WsChatService, new MessageService())
      room.setData({
        id: this.getRoomId(roomData),
@@ -60,7 +63,7 @@ export class WsChatMethodsService {
        this.group[roomId] = room
        this.groupCount++
      }
-      
+
    });

    this.loadingWholeList = false
@@ -97,7 +100,7 @@ export class WsChatMethodsService {

      return roomName
    } else {
-      return roomData.fName
+      return roomData.fname
    }
  }

@@ -19,7 +19,7 @@ import { ThemeService } from 'src/app/services/theme.service'
 import { PreviewCameraPage } from 'src/app/modals/preview-camera/preview-camera.page';
 import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
 import { ViewEventPage } from 'src/app/modals/view-event/view-event.page';
-import { wsChatMethodsService as wsChatMethodsService} from 'src/app/services/chat/chat.service'
+import { WsChatMethodsService} from 'src/app/services/chat/ws-chat-methods.service'

@Component({
  selector: 'app-messages',
@@ -78,9 +78,9 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
    public ThemeService: ThemeService,
    private changeDetectorRef: ChangeDetectorRef,
    private router: Router,
-    public wsChatMethodsService: wsChatMethodsService
+    public wsChatMethodsService: WsChatMethodsService
  ) {
-    
+
    this.loggedUser = authService.ValidatedUserChat['data'];
  }
  ngOnChanges(changes: SimpleChanges): void {