merge developer

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

@@ -57,48 +57,19 @@
       <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='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/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/shared/chat/group-messages/group-messages.page.html

@@ -58,36 +58,6 @@
         </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>
@@ -95,7 +65,6 @@
       <div *ngIf="msg.file">
       <div class="message-item incoming-{{msg.u.username!=loggedUser.me.username}} max-width-45" *ngIf="msg.t != 'r' && msg.t != 'ul' && msg.t != 'au' && msg.t != 'ru' && msg.file.type != 'application/meeting'" >
         <div *ngIf="msg.file.type != 'application/meeting'">
-          AQUI
           <div class="message-item-options d-flex justify-content-end">
             <fa-icon [matMenuTriggerFor]="beforeMenu" icon="chevron-down" class="message-options-icon cursor-pointer"></fa-icon>
             <mat-menu #beforeMenu="matMenu" xPosition="before">
@@ -103,7 +72,6 @@
             </mat-menu>
           </div>
           <div class="title">
-            <ion-label>{{msg.u.name}}</ion-label>
             <span class="time">{{showDateDuration(msg._updatedAt)}}</span>
           </div>
           <div class="message">
@@ -111,10 +79,10 @@
               <div *ngFor="let file of msg.attachments">
                 <div *ngIf="msg.file.type == 'application/img'" (click)="openPreview(msg)">
                   <img *ngIf="file.image_url" src="{{file.image_url}}" alt="image">
+                  <ion-icon *ngIf="msg.file.image_url == null" name="download-outline"></ion-icon>
                 </div>
                 <div *ngIf="msg.file.type != 'application/img'">
                   <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>
@@ -248,7 +216,7 @@
           <ion-fab-button title="Nova Reunião" (click)="bookMeeting()" color="light">
             <ion-icon name="calendar"></ion-icon>
           </ion-fab-button>
-          <ion-fab-button title="Adicionar Documento" (click)="addFile()" color="light">
+          <ion-fab-button hidden title="Adicionar Documento" (click)="addFile()" color="light">
             <ion-icon name="document"></ion-icon>
           </ion-fab-button>
           <ion-fab-button title="Anexar Fotografia" (click)="addImage()" color="light">

src/app/shared/popover/chat-options-popover/chat-options-popover.page.html

@@ -7,8 +7,8 @@
   </div>
   <div class="buttons">
     <button  (click)="takePicture()" full class="btn-ok" shape="round" >Tirar Fotografia</button>
-    <button  (click)="addFile()" class="btn-ok" shape="round" >Anexar Documento</button>
-    <button  (click)="anexarFoto()" full class="btn-ok" shape="round" >Anexar Fotografia</button>
+    <button hidden (click)="addFile()" class="btn-ok" shape="round" >Anexar Documento</button>
+    <button hidden (click)="anexarFoto()" full class="btn-ok" shape="round" >Anexar Fotografia</button>
     <button (click)="addDocGestaoDocumental()" class="btn-ok" shape="round" >Gestão Documental</button>
     <div class="solid"></div>
     <button (click)="bookMeeting()" class="btn-ok" shape="round" >Novo Evento</button>