fix merge

src/app/pages/chat/chat.page.html

@@ -67,19 +67,27 @@
                       <div class="item-date" [class.item-date-active]="room.value.id == idSelected">{{room.value.duration}}</div>
                     </div>
                     <div *ngIf="room.value.lastMessage" class="item-description" [class.item-description-active]="room.value.id == idSelected">
+
                       <ion-label *ngIf="room.value.lastMessage && room.value.otherUserType == false">{{room.value.lastMessage.msg}}</ion-label>
                       <ion-label *ngIf="room.value.otherUserType == true">A escrever ...</ion-label>
                       <ion-label *ngIf="room.value.lastMessage.file">
                         <fa-icon *ngIf="room.value.lastMessage.file.type != 'application/meeting'" icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="room.value.id == idSelected"></fa-icon>
+                      </ion-label>
+
+                      <div *ngIf="room.value.lastMessage.file">
+                        <fa-icon *ngIf="room.value.lastMessage.file.type != 'application/meeting' && room.value.lastMessage.file.type != 'application/img'" icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="room.value.id == idSelected"></fa-icon>
+
                         <fa-icon *ngIf="room.value.lastMessage.file.type == 'application/meeting'" icon="calendar-alt" class="file-icon" [class.set-active-item-font-to-white]="room.value.id == idSelected"></fa-icon>
                         <span> {{room.value.lastMessage.file.name || room.value.lastMessage.file.subject }}</span>
-                      </ion-label>
+                      </div>
+
                       <ion-label *ngIf="room.value.lastMessage.attachments">
                         <div *ngIf="room.value.lastMessage.attachments[0].image_url">
                           <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>
+
                     </div>
                   </div>
                 </div>
@@ -122,11 +130,10 @@
                         <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.value.lastMessage" class="item-description d-flex align-items-center" [class.item-description-active]="group.value.id ==idSelected">
-                        <div class="item-message" *ngIf="group.value.otherUserType == false">{{group.value.lastMessage.u.name}}: {{group.value.lastMessage.msg}} </div>
-
                         <div class="item-message" *ngIf="group.value.otherUserType == false">{{group.value.lastMessage.u.name}}: {{group.value.lastMessage.msg}} </div>
                         <div *ngIf="group.value.otherUserType == true">{{group.value.userThatIsTyping}} A escrever ...</div>
 
+                        <div *ngIf="group.value.lastMessage.u.name" class="item-message">{{group.value.lastMessage.u.name}}: {{group.value.lastMessage.msg}} </div>
                         <div class="item-files add-ellipsis" *ngIf="group.value.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>

src/app/pages/chat/chat.page.ts

@@ -143,6 +143,7 @@ export class ChatPage implements OnInit {
 
   ngOnInit() {
 
+    console.log(this.wsChatMethodsService.dm);
     console.log(this.wsChatMethodsService.group);
 
 
@@ -548,7 +549,7 @@ export class ChatPage implements OnInit {
           return dateB - dateA;
         });
 
-        
+
         //console.log('GROUPS FROM DB',  this.allGroups)
       })
 

src/app/pages/chat/group-messages/group-messages.page.html

@@ -56,49 +56,20 @@
       <ion-label>Esta conversa passou a grupo</ion-label><br />
       <ion-label>A conversa original mantêm-se como chat individual</ion-label>
     </div>
-    <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of wsChatMethodsService.getGroupRoom(roomId).massages; let last = last" [class.messages-list-item-wrapper-active]="msg._id == selectedMsgId">
-      <div *ngIf="msg.t != 'r' && msg.t != 'ul' && msg.t != 'au' && msg.t != 'ru' && msg.msg !=''" (press)="handlePress(msg._id)" class='message-container incoming-{{msg.u.username!=loggedUser.me.username}}'>
+    <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of wsChatMethodsService.getGroupRoom(roomId).messages; let last = last" [class.messages-list-item-wrapper-active]="msg._id == selectedMsgId">
+      <div class='message-container incoming-{{msg.u.username!=loggedUser.me.username}}' *ngIf="msg.t != 'r' && msg.t != 'ul' && msg.t != 'au' && msg.t != 'ru' && msg.msg !=''" (press)="handlePress(msg._id)">
         <div class="title">
           <ion-label>{{msg.u.name ?? ""}}</ion-label>
           <span class="time">{{showDateDuration(msg._updatedAt)}}</span>
         </div>
         <div class="message">
           <ion-label>{{msg.msg}}</ion-label>
-          <div *ngIf="msg.attachments" class="message-attachments">
-            <div *ngFor="let file of msg.attachments">
-              <div (click)="openPreview(msg)">
-                <img *ngIf="file.image_url" src="{{file.image_url}}" alt="image" >
-              </div>
-              <div>
-                <div>
-                  <div class="file">
-                    <!-- <canvas id="pdf_canvas"></canvas> -->
-                    <div (click)="viewDocument(msg.file, file.title_link)" class="file-details add-ellipsis cursor-pointer" *ngIf="msg.file">
-                      <span *ngIf="msg.file.type">
-                        <fa-icon *ngIf="msg.file.type == 'application/pdf'" icon="file-pdf" class="pdf-icon"></fa-icon>
-                        <fa-icon *ngIf="msg.file.type == 'application/word'" icon="file-word" class="word-icon"></fa-icon>
-                        <fa-icon *ngIf="msg.file.type == 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'" icon="file-word" class="excel-icon"></fa-icon>
-                        <ion-icon *ngIf="msg.file.type == 'application/webtrix'" src="assets/icon/webtrix.svg"></ion-icon>
-                      </span>
-                      <ion-label class="file-title">{{file.title}}</ion-label>
-                    </div>
-                  </div>
-                  <div class="file-details-optional">
-                    <ion-label *ngIf="msg.file">
-                      <span *ngIf="file.description">{{file.description}}</span>
-                      <span *ngIf="file.description && msg.file.type != 'application/webtrix'"> • </span>
-                      <span *ngIf="msg.file.type != 'application/webtrix'">{{msg.file.type.replace('application/','').toUpperCase()}}</span>
-                    </ion-label>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
           {{last ? scrollToBottom() : ''}}
         </div>
       </div>
 
-      <div class='message-item incoming-{{msg.u.username!=loggedUser.me.username}} max-width-45' *ngIf="msg.msg ==''">
+
+      <!-- <div class='message-item incoming-{{msg.u.username!=loggedUser.me.username}} max-width-45' *ngIf="msg.msg ==''">
         <div *ngIf="msg.file.type == 'application/img'">
           <div class="message-item-options d-flex justify-content-end">
           </div>
@@ -111,7 +82,6 @@
             <div *ngIf="msg.file" class="message-attachments">
               <div>
                 <div (click)="openPreview(msg)">
-                  <!-- <img *ngIf="file.image_url" src="{{file.image_url}}" alt="image" (click)="imageSize(file.image_url)"> -->
                   File
                   <img *ngIf="msg.file.image_url" src="{{msg.file.image_url}}" alt="image">
                 </div>
@@ -120,22 +90,22 @@
             {{last ? scrollToBottom() : ''}}
           </div>
         </div>
-      </div>
+      </div> -->
 
-      <div *ngIf="msg.t != 'r' && msg.t != 'ul' && msg.t != 'ru' && msg.alias =='documento'" (press)="handlePress(msg._id)" class='message-container incoming-{{msg.u.username!=loggedUser.me.username}}'>
+      <div *ngIf="msg.file">
+      <div class='message-container incoming-{{msg.u.username!=loggedUser.me.username}}' class='message-container incoming-{{msg.u.username!=loggedUser.me.username}}' *ngIf="msg.t != 'r' && msg.t != 'ul' && msg.t != 'ru' && msg.file.type != 'application/meeting'" (press)="handlePress(msg._id)">
         <div class="title">
           <ion-label>{{msg.u.name ?? ""}}</ion-label>
           <span class="time">{{showDateDuration(msg._updatedAt)}}</span>
         </div>
         <div class="message">
-          <ion-label>{{msg.msg}}</ion-label>
           <div *ngIf="msg.attachments" class="message-attachments">
             <div *ngFor="let file of msg.attachments">
-              <div (click)="openPreview(msg)">
+              <div *ngIf="msg.file.type == 'application/img'" (click)="openPreview(msg)">
                 <img *ngIf="msg.image_url" src="{{msg.image_url}}" alt="image" >
+                <ion-icon *ngIf="msg.file.image_url == null" name="download-outline"></ion-icon>
               </div>
-              <div>
-                <div>
+              <div *ngIf="msg.file.type != 'application/img'">
                   <div class="file">
                     <div (click)="viewDocument(msg.file, file.title_link)" class="file-details add-ellipsis cursor-pointer" *ngIf="msg.file">
                       <span *ngIf="msg.file.type">
@@ -154,13 +124,19 @@
                       <span *ngIf="msg.file.type != 'application/webtrix'">{{msg.file.type.replace('application/','').toUpperCase()}}</span>
                     </ion-label>
                   </div>
-                </div>
               </div>
             </div>
           </div>
           {{last ? scrollToBottom() : ''}}
         </div>
       </div>
+      <div *ngIf="msg.file.type == 'application/meeting'" class="info-meeting">
+        <ion-label class="info-meeting-small">{{msg.u.name ?? ""}} criou esta reunião</ion-label><br />
+        <button (click)="goToEvent(msg.file.id)" class="btn-no-color info-meeting-normal"><ion-label class="info-meeting-normal">{{msg.file.subject}}</ion-label></button><br />
+        <ion-label class="info-meeting-medium"><ion-icon name="calendar-outline"></ion-icon> De {{showDateDuration(msg.file.start_date)}} a {{showDateDuration(msg.file.end_date)}}</ion-label><br />
+        <ion-label class="info-meeting-medium"><ion-icon></ion-icon><ion-icon name="location-outline"></ion-icon> {{msg.file.venue}}</ion-label><br />
+      </div>
+      </div>
 
 
       <div *ngIf="msg.t == 'r'" class="info-text">
@@ -191,7 +167,7 @@
         </div>
         {{last ? scrollToBottom() : ''}}
       </div>
-      <div *ngIf="msg.file">
+      <!-- <div *ngIf="msg.file">
         <div *ngIf="msg.file.type == 'application/meeting'" class="info-meeting">
           <ion-label class="info-meeting-small">{{msg.u.name ?? ""}} criou esta reunião</ion-label><br />
           <button (click)="goToEvent(msg.file.id)" class="btn-no-color info-meeting-normal"><ion-label class="info-meeting-normal">{{msg.file.subject}}</ion-label></button><br />
@@ -199,7 +175,7 @@
           <ion-label class="info-meeting-medium"><ion-icon></ion-icon><ion-icon name="location-outline"></ion-icon> {{msg.file.venue}}</ion-label><br />
         </div>
         {{last ? scrollToBottom() : ''}}
-      </div>
+      </div> -->
     </div>
   </div>
   <ion-fab horizontal="end" vertical="bottom" slot="fixed">

src/app/pages/chat/group-messages/group-messages.page.ts

@@ -137,7 +137,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
       "asUser": false,
     }
     if(msgId){
-      this.alertService.confirmDeleteMessage(body);
+      //this.alertService.confirmDeleteMessage(body);
     }
     else{
       this.toastService.badRequest('Não foi possível apagar');
@@ -336,12 +336,14 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
       cssClass: 'chat-popover',
       componentProps: {
         roomId: this.roomId,
+        members: this.members,
       },
     });
     await modal.present();
     modal.onDidDismiss().then(res=>{
       if(res.data == 'leave'){
         console.log('saiu do grupo');
+        //this.wsChatMethodsService.subscribeToRoomUpdate(this.roomId, this.room);
       }
       else if(res.data == 'cancel'){
         console.log('cancel');

src/app/pages/chat/messages/messages.page.html

@@ -49,46 +49,14 @@
     </ion-refresher-content>
   </ion-refresher> -->
   <div (click)="handleClick()" class="messages" #scrollMe>
-    <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of wsChatMethodsService.getDmRoom(this.roomId).massages; let last = last"
-    [class.messages-list-item-wrapper-active]="msg._id == selectedMsgId"  >
-      <div (press)="handlePress(msg._id)" class='message-container incoming-{{msg.u.username!=loggedUser.me.username}}' (click)="downloadFileMsg(msg)">
+    <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of wsChatMethodsService.getDmRoom(this.roomId).massages; let last = last" [class.messages-list-item-wrapper-active]="msg._id == selectedMsgId"  >
+      <div (press)="handlePress(msg._id)" class='message-container incoming-{{msg.u.username!=loggedUser.me.username}}' (click)="downloadFileMsg(msg)" *ngIf="msg.msg !=''">
         <div class="title">
           <ion-label>{{msg.u.name}}</ion-label>
           <span class="time">{{showDateDuration(msg._updatedAt)}}</span>
         </div>
         <div>
           <ion-label>{{msg.msg}}</ion-label>
-          <div *ngIf="msg.attachments" class="message-attachments">
-            <div *ngFor="let file of msg.attachments let i = index">
-              <div (click)="openPreview(msg)">
-                <!-- <img *ngIf="file.image_url" src="{{file.image_url}}" alt="image" (click)="imageSize(file.image_url)"> -->
-                <img *ngIf="msg.file.image_url" src="{{msg.file.image_url}}" alt="image">
-              </div>
-              <div>
-                <div>
-                  <div class="file">
-                    <!-- <canvas id="pdf_canvas"></canvas> -->
-                    <div (click)="docIndex(i); downloadFileMsg(msg)" class="file-details add-ellipsis cursor-pointer" *ngIf="msg.file">
-                      <span *ngIf="msg.file.type">
-                        <fa-icon *ngIf="msg.file.type == 'application/pdf'" icon="file-pdf" class="pdf-icon"></fa-icon>
-                        <fa-icon *ngIf="msg.file.type == 'application/word'" icon="file-word" class="word-icon"></fa-icon>
-                        <fa-icon *ngIf="msg.file.type == 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'" icon="file-word" class="excel-icon"></fa-icon>
-                        <ion-icon *ngIf="msg.file.type == 'application/webtrix'" src="assets/icon/webtrix.svg"></ion-icon>
-                      </span>
-                      <ion-label class="file-title">{{file.title}}</ion-label>
-                    </div>
-                  </div>
-                  <div class="file-details-optional">
-                    <ion-label *ngIf="msg.file && msg.file != ''">
-                      <span *ngIf="file.description">{{file.description}}</span>
-                      <span *ngIf="file.description && msg.file.type != 'application/webtrix'"> • </span>
-                      <span *ngIf="msg.file.type != 'application/webtrix'">{{msg.file.type.replace('application/','').toUpperCase()}}</span>
-                    </ion-label>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
           {{last ? scrollToBottom() : ''}}
         </div>
       </div>
@@ -104,7 +72,9 @@
         </div>
       </div> -->
 
-      <div (press)="handlePress(msg._id)" class='message-container incoming-{{msg.u.username!=loggedUser.me.username}}' *ngIf="msg.alias =='documento'">
+
+      <div *ngIf="msg.file">
+      <div (press)="handlePress(msg._id)" class='message-container incoming-{{msg.u.username!=loggedUser.me.username}}' *ngIf="msg.file.type != 'application/meeting'">
         <div class="title">
           <ion-label>{{msg.u.name}}</ion-label>
           <span class="time">{{showDateDuration(msg._updatedAt)}}</span>
@@ -112,15 +82,12 @@
         <div>
           <div *ngIf="msg.attachments" class="message-attachments">
             <div *ngFor="let file of msg.attachments let i = index">
-              <div (click)="openPreview(msg)">
-                <!-- <img *ngIf="file.image_url" src="{{file.image_url}}" alt="image" (click)="imageSize(file.image_url)"> -->
-                File
+              <div *ngIf="msg.file.type == 'application/img'" (click)="openPreview(msg)">
                 <img *ngIf="msg.file.image_url" src="{{msg.file.image_url}}" alt="image">
+                <ion-icon *ngIf="msg.file.image_url == null" name="download-outline"></ion-icon>
               </div>
-              <div>
-                <div>
+              <div *ngIf="msg.file.type != 'application/img'">
                   <div class="file">
-                    <!-- <canvas id="pdf_canvas"></canvas> -->
                     <div (click)="docIndex(i); viewDocument(msg.file, file.title_link)" class="file-details add-ellipsis cursor-pointer" *ngIf="msg.file">
                       <span *ngIf="msg.file.type">
                         <fa-icon *ngIf="msg.file.type == 'application/pdf'" icon="file-pdf" class="pdf-icon"></fa-icon>
@@ -138,15 +105,22 @@
                       <span *ngIf="msg.file.type != 'application/webtrix'">{{msg.file.type.replace('application/','').toUpperCase()}}</span>
                     </ion-label>
                   </div>
-                </div>
               </div>
             </div>
           </div>
           {{last ? scrollToBottom() : ''}}
         </div>
       </div>
+      <div *ngIf="msg.file.type == 'application/meeting'" class="info-meeting">
+        <ion-label class="info-meeting-small">{{msg.u.name}} criou esta reunião</ion-label><br />
+        <button (click)="goToEvent(msg.file.id)" class="btn-no-color info-meeting-normal"><ion-label class="info-meeting-normal">{{msg.file.subject}}</ion-label></button><br />
+        <ion-label class="info-meeting-medium"><ion-icon name="calendar-outline"></ion-icon> De {{showDateDuration(msg.file.start_date)}} a {{showDateDuration(msg.file.end_date)}}</ion-label><br />
+        <ion-label class="info-meeting-medium"><ion-icon></ion-icon><ion-icon name="location-outline"></ion-icon> {{msg.file.venue}}</ion-label><br />
+      </div>
 
-      <div *ngIf="msg.file">
+      </div>
+
+      <!-- <div *ngIf="msg.file">
         <div *ngIf="msg.file.type == 'application/meeting'" class="info-meeting">
           <ion-label class="info-meeting-small">{{msg.u.name}} criou esta reunião</ion-label><br />
           <button (click)="goToEvent(msg.file.id)" class="btn-no-color info-meeting-normal"><ion-label class="info-meeting-normal">{{msg.file.subject}}</ion-label></button><br />
@@ -154,7 +128,7 @@
           <ion-label class="info-meeting-medium"><ion-icon></ion-icon><ion-icon name="location-outline"></ion-icon> {{msg.file.venue}}</ion-label><br />
         </div>
         {{last ? scrollToBottom() : ''}}
-      </div>
+      </div> -->
     </div>
   </div>
   <ion-fab horizontal="end" vertical="bottom" slot="fixed">

src/app/pages/chat/messages/messages.page.ts

@@ -114,7 +114,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
 
     this.wsChatMethodsService.getDmRoom(this.roomId).loadHistory()
     this.wsChatMethodsService.getDmRoom(this.roomId).scrollDown = this.scrollToBottomClicked
-    
+
     setTimeout(()=>{
       this.scrollToBottomClicked()
     }, 50)
@@ -245,7 +245,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
       "asUser": false,
     }
     if (msgId) {
-      this.alertService.confirmDeleteMessage(body);
+      //this.alertService.confirmDeleteMessage(body);
     }
     else {
       this.toastService.badRequest('Não foi possível apagar');
@@ -580,11 +580,11 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     });
   }
 
-  /* 
+  /*
         this.fileService.downloadFile(element.file.guid).subscribe(async (event) => {
           var name = element.file.guid;
           if (event.type === HttpEventType.DownloadProgress) {
-            
+
           } else if (event.type === HttpEventType.Response) {
             var base64 = btoa(new Uint8Array(event.body).reduce((data, byte) => data + String.fromCharCode(byte), '')
             );
@@ -604,14 +604,14 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
               console.log('error LAKE FS FILE', error)
             });
 
-          
+
 
           const readFile = await Filesystem.readFile({
             path: `${IMAGE_DIR}/${name}`,
             directory: Directory.Data,
-          }); 
-          
-          
+          });
+
+
         });*/
 
   getRoomMessageDB(roomId) {

src/app/pages/chat/new-group/new-group.page.ts

@@ -6,6 +6,8 @@ import { GroupContactsPage } from '../group-messages/group-contacts/group-contac
 import { ThemeService } from 'src/app/services/theme.service'
 import { ChatService } from 'src/app/services/chat.service';
 import { ProcessesService } from 'src/app/services/processes.service';
+import { WsChatMethodsService } from 'src/app/services/chat/ws-chat-methods.service';
+import { AuthService } from 'src/app/services/auth.service';
 
 @Component({
   selector: 'app-new-group',
@@ -21,6 +23,7 @@ export class NewGroupPage implements OnInit {
   thedate:any;
   groupName:string;
   documents:any;
+  loggedUserChat: any;
 
   constructor(
     private pickerController: PickerController,
@@ -30,8 +33,11 @@ export class NewGroupPage implements OnInit {
     public ThemeService: ThemeService,
     private chatService: ChatService,
     private processesService: ProcessesService,
+    public wsChatMethodsService: WsChatMethodsService,
+    private authService: AuthService,
   )
   {
+    this.loggedUserChat = authService.ValidatedUserChat['data'];
     this.isGroupCreated = false;
     this.groupName = this.navParams.get('name');
     this.documents = this.navParams.get('documents');
@@ -55,10 +61,34 @@ export class NewGroupPage implements OnInit {
     this.modalController.dismiss();
   }
 
-  createGroup(){
+  async createGroup(){
     let name = this.groupName.split(' ').join('-');
     //Take out all special characters in string
     name = name.normalize("NFD").replace(/[\u0300-\u036f]/g, "");
+
+    let customFields = {}
+    let res:any;
+
+    if(this.thedate){
+      let customFields = {
+        "countDownDate":this.thedate
+      }
+      res = await this.wsChatMethodsService.createPrivateRoom(name, this.loggedUserChat.me.username, customFields);
+      console.log(res);
+    }
+    else{
+      res = await this.wsChatMethodsService.createPrivateRoom(name, this.loggedUserChat.me.username, customFields);
+      console.log(res);
+    }
+
+    this.isGroupCreated = true;
+    this.addContacts(res.result);
+
+    this.wsChatMethodsService.subscribeToRoomUpdate(res.result.rid, res.result);
+
+    //this.addGroupMessage.emit(res.result.rid);
+
+    /*
     let body = { "name":name, }
     this.chatService.addGroup(body).subscribe(res=>{
       console.log('group created');
@@ -112,7 +142,7 @@ export class NewGroupPage implements OnInit {
           this.chatService.sendMessage(body).toPromise();
         });
       }
-    });
+    }); */
   }
 
   async addContacts(room){