create direct message

src/app/ui/chat/chat-routing.module.ts

@@ -52,7 +52,10 @@ const routes: Routes = [
     path: 'set-room-owner',
     loadChildren: () => import('./modal/set-room-owner/set-room-owner.module').then( m => m.SetRoomOwnerPageModule)
   },
-
+  {
+    path: 'contacts',
+    loadChildren: () => import('./component/contacts/contacts.module').then( m => m.ContactsPageModule)
+  },
 ];
 
 @NgModule({

src/app/ui/chat/chat.module.ts

@@ -18,7 +18,7 @@ import { EditGroupPageModule } from './component/edit-group/edit-group.module';
 import { GroupContactsPageModule } from './component/group-messages/group-contacts/group-contacts.module';
 import { GroupMessagesPageModule } from './component/group-messages/group-messages.module';
 import { MessagesPageModule } from './component/messages/messages.module';
-import { ContactsPageModule } from './component/new-group/contacts/contacts.module';
+import { ContactsPageModule } from './component/contacts/contacts.module';
 import { NewGroupPageModule } from './component/new-group/new-group.module';
 
 @NgModule({

src/app/ui/chat/component/contacts/contacts.module.ts

@@ -18,6 +18,7 @@ import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.
     ContactsPageRoutingModule,
     BtnSeguintePageModule,
   ],
-  declarations: [ContactsPage]
+  declarations: [ContactsPage],
+  exports: [ContactsPage]
 })
 export class ContactsPageModule {}

src/app/ui/chat/component/contacts/contacts.page.html

@@ -9,9 +9,9 @@
           </button>
         </div>
         <div class="div-title">
+          <!-- Create direct message -->
           <ion-label class="title">Contactos</ion-label>
         </div>
-        <app-btn-seguinte (click)="groupMessages()" class="cursor-pointer"></app-btn-seguinte>
       </div>
     </div>
   </ion-toolbar>
@@ -23,34 +23,27 @@
 </ion-header>
 
 <ion-content>
+
   <ion-refresher  name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
-      <!-- <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar> -->
+      <ion-progress-bar type="indeterminate" *ngIf="loading"></ion-progress-bar>
       <ion-refresher-content>
       </ion-refresher-content>
     </ion-refresher>
   <div class="main-content">
+    <ion-progress-bar class="position-absolute" type="indeterminate" *ngIf="loading"></ion-progress-bar>
+    <div *ngFor="let userContainer of userContainer | keyvalue;" >
 
-    <!-- <ion-list>
-      <ion-item *ngFor="let user of searchedItem">
-        {{user.name}}
-      </ion-item>
-    </ion-list> -->
-
-    <!-- <ion-virtual-scroll [items]="ChatSystemService.users" approxItemHeight="70px" [headerFn]="separateLetter">
-
-      <div class="item-divider" *virtualHeader="let header">
-        <ion-label>{{header}}</ion-label>
+      <div class="item-divider">
+        <ion-label>{{ userContainer.key }}</ion-label>
       </div>
 
-      <div *virtualItem="let user" class="item-checkbox">
-        <ion-checkbox color="primary"></ion-checkbox>
-         <p>{{user.first}} {{user.last}}</p>
-        <ion-icon name="ellipse"></ion-icon>
+      <div *ngFor="let user of userContainer.value; let i = index" class="d-flex px-20 align-center" (click)="select(user)">
+        <ion-checkbox [(ngModel)]="user.isChecked"   color="primary"></ion-checkbox>
+        <ion-label class="flex-grow-1 px-10">{{user.wxFullName}}</ion-label>
+        <div class="icon"><ion-icon name="ellipse"></ion-icon></div>
       </div>
-
-    </ion-virtual-scroll> -->
+    </div>
 
   </div>
 </ion-content>
 
-

src/app/ui/chat/component/contacts/contacts.page.scss

@@ -76,52 +76,108 @@
 }
 ion-content{
   --background:transparent;
-}
+} 
+
+
+
 .main-content{
-  width: 100%;
+  //width: 100%;
   height: 100%;
   font-family: Roboto;
   margin: 0 auto;
   background-color: #fff;
-  overflow:auto;
   padding: 0 0 0 0;
+  overflow:auto;
 
-    .item-divider{
-      background: #ebebeb;
-      font-size: rem(15);
-      margin: 10px 0 10px 0;
-      padding:5px 0 5px 20px;
- 
+  .members{
+    padding: 15px 20px 0 20px !important;
+
+    .members-list{
+     margin: 0 !important;
+     padding: 0 !important;
     }
+  }
+
+   .members-label{
+     //margin: 10px 20px 10px 20px !important;
+     /* font-size: rem(15); */
+     font-weight: bold;
+   }
+
+   .members-checkbox{
+     display: flex;
+     //margin: 0px 20px 0px 20px !important;
+     overflow: auto;
+     align-items: center;
+
+     .detele-item-icon{
+       display: none;
+       width: rem(30);
+       margin-left: 15px;
+     }
+ 
+     .detele-item-icon ion-icon{
+       font-size: rem(20) !important;
+     }
+   }
+
+   .members-checkbox:hover{
+     .detele-item-icon{
+       display: flex;
+       justify-content: flex-end;
+     }
+   }
+   
+   .item-divider{
+     background: #ebebeb;
+     font-size: rem(15);
+     margin: 10px 0 10px 0;
+     padding:5px 0 5px 20px;
+ 
+   }
 
     .item-checkbox{
       display: flex;
       margin: 10px 20px 10px 20px !important;
       overflow: auto;
-      align-items: center;
-
     }
 
-    .item-checkbox ion-checkbox{
-        --border-color: #0d89d1;
-        --background-checked:#0d89d1;
+    .item-checkbox ion-checkbox, .members-checkbox ion-checkbox{
+        --border-color: var(--title-text-color);
+        --background-checked:var(--title-text-color);
         float: left;
     }
 
-    .item-checkbox p{
-        display: block;
-        margin: 0 !important;
-        width: 330px;
+    .item-checkbox ion-label, .members-checkbox p{
         padding-left: 10px;
         font-size: rem(15);
-        color: #0d89d1;
+        color: var(--title-text-color);
         float: left;
+        flex-grow: 1;
     }
-    .item-checkbox ion-icon{
+    .icon, .members-checkbox ion-icon{
       font-size: rem(10);
-      float: left;
-      color:#99e47b;
-      margin-left: 10px;
     }
+    .online{
+     color:#99e47b !important;
+   }
+  .offline{
+    color:#cbced1 !important;
+   }
+  .away{
+   color:#ffd21f !important;
+   }
+   .invisible{
+     color:#cbced1 !important;
+   }
+   .busy{
+     color:#f5455c !important;
+   }
   }
 
+.inactive {
+ opacity: 0.7;
+ button {
+   display: none !important;
+ }
+}

src/app/ui/chat/component/contacts/contacts.page.ts

@@ -0,0 +1,153 @@
+import { Component, EventEmitter, OnInit, Output } from '@angular/core';
+import { ModalController } from '@ionic/angular';
+import { GroupMessagesPage } from '../group-messages/group-messages.page';
+import { ThemeService } from 'src/app/services/theme.service'
+import { UserContacts } from 'src/app/services/Repositorys/contacts/data-source/contacts-data-source.service';
+import { ContactRepositoryService } from 'src/app/services/Repositorys/contacts/repository/contacts-repository.service';
+import { ChatServiceService } from 'src/app/module/chat/domain/chat-service.service';
+import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
+import { ToastService } from 'src/app/services/toast.service';
+import { SessionStore } from 'src/app/store/session.service';
+import { MessageEnum } from 'src/app/module/chat/domain/use-case/message-create-use-case.service';
+import { MessageEntity } from 'src/app/module/chat/domain/entity/message';
+// import { ChatSystemService } from 'src/app/services/chat/chat-system.service'
+
+@Component({
+  selector: 'app-contacts',
+  templateUrl: './contacts.page.html',
+  styleUrls: ['./contacts.page.scss'],
+})
+export class ContactsPage implements OnInit {
+  options:any;
+
+  loading = false
+  userList: UserContacts[] = []
+  currentMembers:UserContacts[];
+  allChatUsers: UserContacts[]  = [];
+  userContainer: {[key: string]: ( UserContacts & {isChecked: boolean})[] } = {}
+
+  @Output() openMessage: EventEmitter<any> = new EventEmitter<any>();
+  @Output() emptyTextDescriptionOpen: EventEmitter<any> = new EventEmitter<any>();
+  @Output() backToChat: EventEmitter<any> = new EventEmitter<any>();
+  @Output() closeAllDesktopComponents: EventEmitter<any> = new EventEmitter<any>();
+
+  roomId= ''
+
+  constructor(
+    private modalController: ModalController,
+    public ThemeService: ThemeService,
+    private contactsRepositoryService: ContactRepositoryService,
+    private httpErrorHandle: HttpErrorHandle,
+    private toastService: ToastService,
+    private chatServiceService: ChatServiceService
+  )
+  {}
+
+  ngOnInit() {
+    this.loadUsers();
+
+  }
+
+  async loadUsers() {
+
+    this.loading = true
+    const getallChatUsers = await this.contactsRepositoryService.getUsers()
+
+    if(getallChatUsers.isOk())  {
+
+      this.allChatUsers = getallChatUsers.value.data.result.sort((a,b) => {
+        if(a.wxFullName < b.wxFullName) {
+          return -1;
+        }
+        if(a.wxFullName > b.wxFullName) {
+          return 1;
+        }
+        return 0;
+      });
+
+
+      for(const user of this.allChatUsers) {
+        const firstLetter = user.wxFullName.charAt(0)
+
+        if(!this.userContainer[firstLetter]) {
+          user['isChecked'] = false
+          this.userContainer[firstLetter] = [user as any]
+        } else {
+          const userIds = this.userContainer[firstLetter].map( e => e.wxUserId)
+          if(!userIds.includes(user.wxUserId)) {
+            user['isChecked'] = false
+            this.userContainer[firstLetter].push(user as any)
+          }
+        }
+      }
+
+
+    }
+    else if (getallChatUsers.isErr() ) {
+      console.log(getallChatUsers.error)
+    } else {
+      this.toastService._badRequest("Pedimos desculpa mas não foi possível executar a acção. Por favor, contacte o apoio técnico.")
+    }
+
+
+    this.loading = false;
+  }
+
+  separateLetter(record, recordIndex, records){
+
+    if(recordIndex == 0){
+      return record.first[0];
+    }
+
+    let first_prev = records[recordIndex - 1].first[0];
+    let first_current = record.first[0];
+
+    if(first_prev != first_current){
+      return first_current;
+    }
+    return null;
+  }
+
+  doRefresh(event){
+
+  }
+  close(roomId) {
+    if (roomId) {
+      this.backToChat.emit({ roomId: roomId });
+    } else {
+      this.closeAllDesktopComponents.emit();
+    }
+  }
+
+  onChange(event) {
+
+  } 
+
+  clicked() {}
+
+
+  selectOnce = true
+  async select(user: UserContacts) {
+    
+    const message = new MessageEntity();
+
+    message.sender = {
+      userPhoto: '',
+      wxeMail: SessionStore.user.Email,
+      wxFullName: SessionStore.user.FullName,
+      wxUserId: SessionStore.user.UserId
+    }
+
+    message.receiverId = user.wxUserId
+    message.message = 'hello'
+
+    const result = await this.chatServiceService.sendMessage(message, MessageEnum.Direct)
+    
+    if(result.isOk()) {
+      this.close(result.value.roomId)
+    } else {
+      console.log(result.error)
+    }
+  }
+
+}

src/app/ui/chat/component/group-messages/group-contacts/group-contacts.page.html

@@ -48,7 +48,7 @@
         </div>
       </ion-list>
     </div>
-
+pppp
     <div *ngFor="let userContainer of userContainer | keyvalue;" >
 
       <div class="item-divider">

src/app/ui/chat/component/messages/messages.page.ts

@@ -1,7 +1,7 @@
 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 { ToastService } from 'src/app/services/toast.service';
-import { ContactsPage } from '../new-group/contacts/contacts.page';
+import { ContactsPage } from '../contacts/contacts.page';
 import { ChatOptionsFeaturesPage } from 'src/app/modals/chat-options-features/chat-options-features.page';
 import { TimeService } from 'src/app/services/functions/time.service';
 import { FileService } from 'src/app/services/functions/file.service';
@@ -43,8 +43,9 @@ import { ChatPopoverPage } from '../../modal/chat-popover/chat-popover.page';
 import { LastMessage } from '../../utils/lastMessage';
 import { UserTypingLocalRepository } from 'src/app/module/chat/data/repository/user-typing-local-data-source.service';
 import { UserTypingRemoteRepositoryService } from 'src/app/module/chat/data/repository/user-typing-live-data-source.service';
-import { MessageLocalDataSourceService } from 'src/app/module/chat/data/repository/message-local-data-source.service';
-import { MessageRemoteDataSourceService } from 'src/app/module/chat/data/repository/message-remote-data-source.service';
+import { MessageLocalDataSourceService } from 'src/app/module/chat/data/repository/message/message-local-data-source.service';
+import { MessageRemoteDataSourceService } from 'src/app/module/chat/data/repository/message/message-remote-data-source.service';
+import { MessageEnum } from 'src/app/module/chat/domain/use-case/message-create-use-case.service';
 
 
 @Component({
@@ -567,7 +568,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
       safeFile: this.sanitiser.bypassSecurityTrustResourceUrl(this.audioRecordedDataUrl)
     }]
 
-    this.chatServiceService.sendMessage(message)
+    this.chatServiceService.sendMessage(message, MessageEnum.group)
     this.messages1[this.roomId].push(message)
     setTimeout(() => {
       this.scrollToBottomClicked()
@@ -628,7 +629,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     setTimeout(() => {
       this.scrollToBottomClicked()
     }, 100)
-    const data = await this.chatServiceService.sendMessage(message)
+    const data = await this.chatServiceService.sendMessage(message, MessageEnum.group)
 
   }
 
@@ -810,7 +811,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
         setTimeout(() => {
           this.scrollToBottomClicked()
         }, 100)
-        this.chatServiceService.sendMessage(message)
+        this.chatServiceService.sendMessage(message, MessageEnum.group)
 
       }
 
@@ -866,7 +867,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
         setTimeout(() => {
           this.scrollToBottomClicked()
         }, 100)
-        this.chatServiceService.sendMessage(message)
+        this.chatServiceService.sendMessage(message, MessageEnum.group)
         this.textField = ''
 
       }
@@ -920,7 +921,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
           setTimeout(() => {
             this.scrollToBottomClicked()
           }, 100)
-          this.chatServiceService.sendMessage(message)
+          this.chatServiceService.sendMessage(message, MessageEnum.group)
         }
     }
 
@@ -976,7 +977,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
           setTimeout(() => {
             this.scrollToBottomClicked()
           }, 100)
-          this.chatServiceService.sendMessage(message)
+          this.chatServiceService.sendMessage(message, MessageEnum.group)
         }
 
       } else {

src/app/ui/chat/component/new-group/contacts/contacts.page.ts

@@ -1,73 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { ModalController } from '@ionic/angular';
-import { GroupMessagesPage } from '../../group-messages/group-messages.page';
-import { ThemeService } from 'src/app/services/theme.service'
-// import { ChatSystemService } from 'src/app/services/chat/chat-system.service'
-
-@Component({
-  selector: 'app-contacts',
-  templateUrl: './contacts.page.html',
-  styleUrls: ['./contacts.page.scss'],
-})
-export class ContactsPage implements OnInit {
-  options:any;
-
-  constructor(
-    private modalController: ModalController,
-    public ThemeService: ThemeService,
-    // public ChatSystemService: ChatSystemService
-  )
-  {
-
-  }
-
-  ngOnInit() {
-    this.loadUsers();
-
-  }
-
-  loadUsers(){
-    // sthis.ChatSystemService.getUser()
-  }
-
-  separateLetter(record, recordIndex, records){
-
-    if(recordIndex == 0){
-      return record.first[0];
-    }
-
-    let first_prev = records[recordIndex - 1].first[0];
-    let first_current = record.first[0];
-
-    if(first_prev != first_current){
-      return first_current;
-    }
-    return null;
-  }
-
-  doRefresh(event){
-
-  }
-  close(){
-    this.modalController.dismiss();
-  }
-  onChange(event){
-
-  }
-  clicked(){
-
-
-  }
-  async groupMessages(){
-    const modal = await this.modalController.create({
-      component: GroupMessagesPage,
-      componentProps: {},
-      cssClass: 'contacts',
-      backdropDismiss: false
-    });
-
-    modal.onDidDismiss();
-    await modal.present();
-  }
-
-}

src/app/ui/chat/component/new-group/new-group-routing.module.ts

@@ -7,10 +7,6 @@ const routes: Routes = [
   {
     path: '',
     component: NewGroupPage
-  },
-  {
-    path: 'contacts',
-    loadChildren: () => import('./contacts/contacts.module').then( m => m.ContactsPageModule)
   }
 ];
 

src/app/ui/chat/modal/messages/contacts/contacts.page.html

@@ -11,7 +11,7 @@
         </div>
         <div class="div-title">
           <!-- MOBILE -->
-          <ion-label class="title">Nova Conversa</ion-label>
+          <ion-label class="title">Nova Conversa ..</ion-label>
         </div>
       </div>
     </div>
@@ -38,8 +38,8 @@
         <ion-label>{{ userContainer.key }}</ion-label>
       </div>
 
-      <div *ngFor="let user of userContainer.value; let i = index" class="d-flex px-20 align-center">
-        <ion-label class="flex-grow-1 px-10">{{user.wxFullName}}</ion-label>
+      <div *ngFor="let user of userContainer.value; let i = index" class="d-flex px-20 align-center" (click)="select(user)">
+        <ion-label class="flex-grow-1 px-10 cursor-pointer">{{user.wxFullName}}</ion-label>
         <div class="icon"><ion-icon name="ellipse"></ion-icon></div>
       </div>
     </div>

src/app/ui/chat/modal/messages/contacts/contacts.page.ts

@@ -6,6 +6,9 @@ import { ContactRepositoryService } from 'src/app/services/Repositorys/contacts/
 import { UserContacts } from 'src/app/services/Repositorys/contacts/data-source/contacts-data-source.service';
 import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
 import { ToastService } from 'src/app/services/toast.service';
+import { ChatServiceService } from 'src/app/module/chat/domain/chat-service.service'
+import { MessageEntity } from 'src/app/module/chat/domain/entity/message';
+import { MessageEnum } from 'src/app/module/chat/domain/use-case/message-create-use-case.service';
 
 
 @Component({
@@ -38,6 +41,7 @@ export class ContactsPage implements OnInit {
     private contactsRepositoryService: ContactRepositoryService,
     private httpErrorHandle: HttpErrorHandle,
     private toastService: ToastService,
+    private chatServiceService: ChatServiceService
   )
   {
     this.loggedUser = SessionStore.user.ChatData['data'];
@@ -159,4 +163,23 @@ export class ContactsPage implements OnInit {
   close() {
     this.modalController.dismiss({});
   }
+
+  select(user: UserContacts) {
+    
+    const message = new MessageEntity();
+
+    message.sender = {
+      userPhoto: '',
+      wxeMail: SessionStore.user.Email,
+      wxFullName: SessionStore.user.FullName,
+      wxUserId: SessionStore.user.UserId
+    }
+
+    message.receiverId = user.wxUserId
+
+    message.message = 'hello'
+
+    this.chatServiceService.sendMessage(message, MessageEnum.Direct)
+    
+  }
 }

src/app/ui/chat/modal/messages/messages.page.ts

@@ -44,7 +44,8 @@ import { RoomLocalRepository } from 'src/app/module/chat/data/repository/room-lo
 import { MemberListLocalRepository } from 'src/app/module/chat/data/repository/member-list-local-repository.service'
 import { UserTypingLocalRepository } from 'src/app/module/chat/data/repository/user-typing-local-data-source.service';
 import { UserTypingRemoteRepositoryService } from 'src/app/module/chat/data/repository/user-typing-live-data-source.service';
-import { MessageLocalDataSourceService } from 'src/app/module/chat/data/repository/message-local-data-source.service';
+import { MessageLocalDataSourceService } from 'src/app/module/chat/data/repository/message/message-local-data-source.service';
+import { MessageEnum } from 'src/app/module/chat/domain/use-case/message-create-use-case.service';
 
 
 const IMAGE_DIR = 'stored-images';
@@ -525,7 +526,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
       wxUserId: SessionStore.user.UserId
     }
 
-    this.chatServiceService.sendMessage(message)
+    this.chatServiceService.sendMessage(message, MessageEnum.group)
     this.messages1[this.roomId].push(message)
 
     this.textField = ''
@@ -568,7 +569,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
       }]
 
       this.messages1[this.roomId].push(message)
-      this.chatServiceService.sendMessage(message)
+      this.chatServiceService.sendMessage(message, MessageEnum.group)
       setTimeout(() => {
         this.scrollToBottomClicked()
       }, 100)
@@ -749,7 +750,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
         }]
 
         this.messages1[this.roomId].push(message)
-        this.chatServiceService.sendMessage(message)
+        this.chatServiceService.sendMessage(message, MessageEnum.group)
 
       }
 
@@ -799,7 +800,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
         }]
 
         this.messages1[this.roomId].push(message)
-        this.chatServiceService.sendMessage(message)
+        this.chatServiceService.sendMessage(message, MessageEnum.group)
         this.textField = ''
 
       }
@@ -845,7 +846,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
           }]
 
           this.messages1[this.roomId].push(message)
-          this.chatServiceService.sendMessage(message)
+          this.chatServiceService.sendMessage(message, MessageEnum.group)
         }
     }
 
@@ -896,7 +897,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
         }]
 
         this.messages1[this.roomId].push(message)
-        this.chatServiceService.sendMessage(message)
+        this.chatServiceService.sendMessage(message, MessageEnum.group)
 
         return
       }
@@ -940,7 +941,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
           }]
 
           this.messages1[this.roomId].push(message)
-          this.chatServiceService.sendMessage(message)
+          this.chatServiceService.sendMessage(message, MessageEnum.group)
 
         }