From b596dfbaeb394a8e196a19acc5dccea39b7a0a2a Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 5 Jun 2024 12:25:44 +0100
Subject: [PATCH] change list

---
 src/app/pages/chat/chat.page.html             | 54 +++++++++----------
 .../repository/room-repository.service.ts     |  7 +--
 2 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index 1a7bdf713..a209bc832 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -42,6 +42,33 @@
         <div class=" aside overflow-y-auto d-flex flex-wrap flex-grow-1">
         <div class="width-100" [ngSwitch]="segment">
           <ion-list *ngSwitchCase="'Contactos'">
+            <ion-item-sliding >
+              <div *ngFor="let group of ChatSystemService._group"
+
+              [class.item-active]="group.id ==idSelected"
+              class="item item-hover d-flex">
+
+                <div class="item-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>
+                </div>
+                <div (click)="openGroupMessagesPage(group.id)" class="item-content flex-grow-1 cursor-pointer">
+                  <div class="item-title-time">
+                    <div class="item-title add-ellipsis" [class.item-title-active]="group.id ==idSelected">
+                      <p class="font-15-em add-ellipsis mb-0 white-space-nowrap" [class.bold-message]="group.messageUnread == true">{{group.name.split('-').join(' ')}}</p>
+                    </div>
+                    <div class="item-date font-13-em" [class.item-date-active]="group.id ==idSelected" *ngIf="group.lastMessage && !group.customFields.countDownDate">{{group.duration }}</div>
+                    <div class="item-date font-13-em" [class.item-date-active]="group.id ==idSelected" *ngIf="group.customFields.countDownDate">{{group.countDownTime }}</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 font-13-em add-ellipsis white-space-nowrap" *ngIf="group.otherUserType == false">{{group.lastMessage.u.name}} <span *ngIf="group.lastMessage.u.name">:</span> {{group.lastMessage.msg}} </div>
+                    <div class="font-13-em" *ngIf="group.otherUserType == true">{{group.userThatIsTyping}} está escrever ...</div>
+                  </div>
+                </div>
+              </div>
+          </ion-item-sliding>
+          </ion-list>
+          <ion-list *ngSwitchCase="'Grupos'">
             <ion-item-sliding>
               <div  class="item item-hover width-100 d-flex ion-no-padding ion-no-margin"
                  *ngFor="let room of (items$ | async)"
@@ -75,33 +102,6 @@
                 </div>
             </ion-item-sliding>
           </ion-list>
-          <ion-list *ngSwitchCase="'Grupos'">
-              <ion-item-sliding >
-                  <div *ngFor="let group of ChatSystemService._group"
-
-                  [class.item-active]="group.id ==idSelected"
-                  class="item item-hover d-flex">
-
-                    <div class="item-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>
-                    </div>
-                    <div (click)="openGroupMessagesPage(group.id)" class="item-content flex-grow-1 cursor-pointer">
-                      <div class="item-title-time">
-                        <div class="item-title add-ellipsis" [class.item-title-active]="group.id ==idSelected">
-                          <p class="font-15-em add-ellipsis mb-0 white-space-nowrap" [class.bold-message]="group.messageUnread == true">{{group.name.split('-').join(' ')}}</p>
-                        </div>
-                        <div class="item-date font-13-em" [class.item-date-active]="group.id ==idSelected" *ngIf="group.lastMessage && !group.customFields.countDownDate">{{group.duration }}</div>
-                        <div class="item-date font-13-em" [class.item-date-active]="group.id ==idSelected" *ngIf="group.customFields.countDownDate">{{group.countDownTime }}</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 font-13-em add-ellipsis white-space-nowrap" *ngIf="group.otherUserType == false">{{group.lastMessage.u.name}} <span *ngIf="group.lastMessage.u.name">:</span> {{group.lastMessage.msg}} </div>
-                        <div class="font-13-em" *ngIf="group.otherUserType == true">{{group.userThatIsTyping}} está escrever ...</div>
-                      </div>
-                    </div>
-                  </div>
-              </ion-item-sliding>
-          </ion-list>
         </div>
 
        <!--  <button (click)="sendMsg()" style="height: 41px;">Send message</button> -->
diff --git a/src/app/services/Repositorys/chat/repository/room-repository.service.ts b/src/app/services/Repositorys/chat/repository/room-repository.service.ts
index f6c093d6d..8bfbe584d 100644
--- a/src/app/services/Repositorys/chat/repository/room-repository.service.ts
+++ b/src/app/services/Repositorys/chat/repository/room-repository.service.ts
@@ -32,15 +32,10 @@ export class RoomRepositoryService {
 
   async create(data: RoomInputDTO) {
 
-    this.list()
-
     const result = await this.roomRemoteDataSourceService.createRoom(data)
 
     if(result.isOk()) {
-
-      console.log('result', result)
-      this.roomMemoryDataSourceService.dispatch( addRoom(result.value) )
-
+      this.roomMemoryDataSourceService.dispatch(addRoom(result.value))
       this.roomLocalDataSourceService.createRoom(result.value.data)
     }