Merge branch 'developer' of bitbucket.org:equilibriumito/gabinete-digital into developer

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

@@ -114,6 +114,14 @@
                 NOT UPLOADED
               </div>
               <div *ngIf="msg.file.type == 'application/img' && msg.attachments[0].image_url" (click)="openPreview(msg)">
+                <div *ngIf="!msg.attachments[0].image_url">
+                  <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
+                    <ion-icon name="image" class="file-icon"></ion-icon>
+                    <ion-label>{{"Imagem"}}</ion-label>
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+                  </ion-item>
+                </div>
                 <img *ngIf="msg.attachments[0].image_url" src="{{msg.attachments[0].image_url}}" alt="image" >
                 <ion-icon *ngIf="msg.attachments[0].image_url == null" name="download-outline"></ion-icon>
                 <ion-label class="float-status-all float-status" >
@@ -126,6 +134,15 @@
               <div *ngIf="msg.file.type != 'application/img'">
                   <div class="file add-attachment-bg-color" *ngIf="msg.file.type != 'application/audio'">
                     <div (click)="openPreview(msg)" class="file-details add-ellipsis cursor-pointer" *ngIf="msg.file">
+                      <div *ngIf="!msg.attachments[0].image_url">
+                        <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
+                          <ion-icon name="document" class="file-icon"></ion-icon>
+                          <ion-label>{{file.title}}</ion-label>
+                          <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
+                          <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+                        </ion-item>
+                      </div>
+                      <div *ngIf="msg.attachments[0].image_url">
                       <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>
@@ -135,11 +152,12 @@
                       </span>
                       <ion-label class="file-title">{{file.title}}</ion-label>
                     </div>
+                    </div>
                   </div>
                   <div class="audio-contentainer" *ngIf="msg.file.type == 'application/audio' && !file.title_link">
                     <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
                       <ion-icon name="mic-outline" class="file-icon"></ion-icon>
-                      <ion-label>{{file.title}}</ion-label>
+                      <ion-label>{{"Mensagem de voz"}}</ion-label>
                       <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
                       <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
                     </ion-item>
@@ -151,7 +169,7 @@
                     <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 != 'application/audio'">{{msg.displayType}}</span>
+                     
                     </ion-label>
                     <ion-label class="float-status-all float-status" >
 

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

@@ -79,18 +79,38 @@
           <div *ngIf="msg.attachments" class="message-attachments">
             <div *ngFor="let file of msg.attachments let i = index">
               <div *ngIf="msg.file.type == 'application/img'" (click)="openPreview(msg)">
+                <div *ngIf="!msg.attachments[0].image_url">
+                  <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
+                    <ion-icon name="image" class="file-icon"></ion-icon>
+                    <ion-label>{{"Imagem"}}</ion-label>
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+                  </ion-item>
+                </div>
                 <img *ngIf="msg.attachments[0].image_url" src="{{msg.attachments[0].image_url}}" alt="image">
+                
                 <ion-label class="float-status-all float-status" >
                   <ion-icon *ngIf="msg.messageSend == false" src="assets/images/clock-regular.svg"></ion-icon>
                   <ion-icon *ngIf="msg.messageSend == true && msg.received.length == 0" src="assets/images/check-solid.svg"></ion-icon>
                   <ion-icon *ngIf="msg.messageSend && msg.received.length >= 1 && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon>
                   <ion-icon *ngIf="msg.viewed.length >= 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon>
                 </ion-label>
-                <ion-icon *ngIf="msg.attachments[0].image_url == null" name="download-outline"></ion-icon>
+              
               </div>
               <div *ngIf="msg.file.type != 'application/img'">
                   <div class="file add-attachment-bg-color" *ngIf="msg.file.type != 'application/audio'">
                     <div (click)="docIndex(i); openPreview(msg)" class="file-details add-ellipsis cursor-pointer" *ngIf="msg.file">
+
+                      <div *ngIf="!msg.attachments[0].image_url">
+                        <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
+                          <ion-icon name="document" class="file-icon"></ion-icon>
+                          <ion-label>{{file.title}}</ion-label>
+                          <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
+                          <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+                        </ion-item>
+                      </div>
+
+                     <div *ngIf="msg.attachments[0].image_url">
                       <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/vnd.openxmlformats-officedocument.wordprocessingml.document'" icon="file-word" class="word-icon"></fa-icon>
@@ -103,12 +123,14 @@
                         </ion-icon>
                       </span>
                       <ion-label class="file-title">{{file.title}}</ion-label>
+                     </div>
+                     <!-- <ion-progress-bar [type]="'indeterminate'" *ngIf="downloadLoader"></ion-progress-bar> -->
                     </div>
                   </div>
                   <div class="audio-contentainer" *ngIf="msg.file.type == 'application/audio' && !file.title_link">
                     <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
                       <ion-icon name="mic-outline" class="file-icon"></ion-icon>
-                      <ion-label>{{file.title}}</ion-label>
+                      <ion-label>{{"Mensagem de voz"}}</ion-label>
                       <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
                       <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
                     </ion-item>
@@ -121,8 +143,7 @@
                     <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 != 'application/audio'">{{msg.displayType}}</span>
+                     
                     </ion-label>
 
                     <ion-label class="float-status-all float-status" >

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

@@ -107,6 +107,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
   pdfUrl?: string;
   base64File: string;
   downloadProgess: number;
+  downloadLoader: boolean;
 
   audioPermissionStatus: 'granted'| 'denied' | 'prompt' | null = null
 
@@ -928,7 +929,9 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
 
 
   downloadFileMsg(msg: MessageService) {
+    this.downloadLoader = msg.downloadLoader;
     msg.downloadFileMsg();
+    this.downloadLoader = msg.downloadLoader;
   }
 
   b64toBlob(b64Data, contentType) {

src/app/services/chat/message.service.ts

@@ -56,6 +56,7 @@ export class MessageService {
   messageSend = false
   delate = false
   delateRequest = false
+  downloadLoader: boolean;
 
   constructor(private storage: Storage,
     private NfService: NfService,
@@ -182,8 +183,8 @@ export class MessageService {
 
   async sendRequest(params) {
 
-    if(params?.attachments?.image_url) {
-      delete params?.attachments?.image_url
+    if(params?.attachments[0]?.image_url) {
+      delete params?.attachments[0]?.image_url
     }
 
 
@@ -225,6 +226,7 @@ export class MessageService {
 
   downloadFileMsg() {
 
+    this.downloadLoader = true;
     let downloadFile = "";
     this.AttachmentsService.downloadFile(this.file.guid).subscribe(async (event) => {
 
@@ -256,6 +258,7 @@ export class MessageService {
 
         // save the changes to the storage
         this.save()
+        this.downloadLoader = false;
       }
     });
 

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

@@ -85,10 +85,18 @@
               <div *ngIf="msg.attachments" class="message-attachments">
                 <div *ngFor="let file of msg.attachments">
                   <div *ngIf="msg.file.type == 'application/img' && !msg.attachments[0].image_url" (click)="openPreview(msg)">
-                    NOT UPLOADED
+                    <div *ngIf="!msg.attachments[0].image_url">
+                      <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
+                        <ion-icon name="image" class="file-icon"></ion-icon>
+                        <ion-label>{{"Imagem"}}</ion-label>
+                        <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
+                        <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+                      </ion-item>
+                    </div>
                   </div>
                   <div *ngIf="msg.file.type == 'application/img' &&
                   msg.attachments[0].image_url" (click)="openPreview(msg)">
+
                     <img *ngIf="msg.attachments[0].image_url" src="{{msg.attachments[0].image_url}}" alt="image">
                     <ion-icon *ngIf="msg.attachments[0].image_url == null" name="download-outline"></ion-icon>
                     <ion-label class="float-status-all float-status" >
@@ -102,20 +110,30 @@
                   <div *ngIf="msg.file.type != 'application/img'">
                     <div *ngIf="msg.file.type != 'application/audio'" class="file add-attachment-bg-color">
                         <div (click)="openPreview(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.wordprocessingml.document'" 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 *ngIf="!msg.attachments[0].image_url">
+                            <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
+                              <ion-icon name="document" class="file-icon"></ion-icon>
+                              <ion-label>{{file.title}}</ion-label>
+                              <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
+                              <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+                            </ion-item>
+                          </div>
+                          <div *ngIf="msg.attachments[0].image_url">
+                            <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.wordprocessingml.document'" 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>
                       <div (click)="audioPreview(msg)" class="audio-contentainer" *ngIf="msg.file.type == 'application/audio' && !file.title_link">
                         <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
                           <ion-icon name="mic-outline" class="file-icon"></ion-icon>
-                          <ion-label>{{file.title}}</ion-label>
+                          <ion-label>{{"Mensagem de voz"}}</ion-label>
                           <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
                           <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
                         </ion-item>
@@ -127,7 +145,7 @@
                         <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 != 'application/audio'">{{msg.displayType}}</span>
+
                         </ion-label>
                         <ion-label class="float-status-all float-status" >
 

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

@@ -786,7 +786,6 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
       },
       attachments: [{
         "title": capturedImageTitle,
-        "image_url": capturedImage,
         "text": "description",
         "title_link_download": false,
       }],

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

@@ -82,7 +82,15 @@
             <div *ngIf="msg.attachments" class="message-attachments">
               <div *ngFor="let file of msg.attachments">
                 <div *ngIf="msg.file.type == 'application/img'" (click)="openPreview(msg)" dfsdvsvs>
-                  <img src={{msg.attachments[0].image_url}} alt="image">
+                  <div *ngIf="!msg.attachments[0].image_url">
+                  <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
+                    <ion-icon name="image" class="file-icon"></ion-icon>
+                    <ion-label>{{"Imagem"}}</ion-label>
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+                  </ion-item>
+                </div>
+                  <img *ngIf="msg.attachments[0].image_url" src={{msg.attachments[0].image_url}} alt="image">
                   <ion-label class="float-status-all float-status" >
                     <ion-icon *ngIf="msg.messageSend == false" src="assets/images/clock-regular.svg"></ion-icon>
                     <ion-icon *ngIf="msg.messageSend == true && msg.received.length == 0" src="assets/images/check-solid.svg"></ion-icon>
@@ -93,26 +101,38 @@
                 <div *ngIf="msg.file.type != 'application/img'">
                   <div *ngIf="msg.file.type != 'application/audio'" class="file add-attachment-bg-color">
                     <div (click)="openPreview(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.wordprocessingml.document'" 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>
-                        <ion-icon *ngIf="msg.file.type == 'application/meeting'" src="assets/icon/webtrix.svg">
-                        </ion-icon>
-                      </span>
-                      <ion-label class="file-title">{{file.title}}</ion-label>
+
+                      <div *ngIf="!msg.attachments[0].image_url">
+                        <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
+                          <ion-icon name="document" class="file-icon"></ion-icon>
+                          <ion-label>{{ file.title}}</ion-label>
+                          <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
+                          <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+                        </ion-item>
+                      </div>
+
+                      <div *ngIf="msg.attachments[0].image_url">
+                        <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.wordprocessingml.document'" 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>
+                          <ion-icon *ngIf="msg.file.type == 'application/meeting'" src="assets/icon/webtrix.svg">
+                          </ion-icon>
+                        </span>
+                        <ion-label class="file-title">{{file.title}}</ion-label>
+                      </div>
                     </div>
                   </div>
                   <div (click)="audioPreview(msg)" class="audio-contentainer" *ngIf="msg.file.type == 'application/audio' && !file.title_link">
                     <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
                       <ion-icon name="mic-outline" class="file-icon"></ion-icon>
-                      <ion-label>{{file.title}}</ion-label>
+                      <ion-label>{{'Mensagem de voz'}}</ion-label>
                       <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
                       <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
                     </ion-item>
@@ -124,7 +144,7 @@
                     <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 != 'application/audio'">{{msg.displayType}}</span>
+                     
                     </ion-label>
                     <ion-label class="float-status-all float-status" >
 

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

@@ -26,14 +26,17 @@ export class ChatOptionsPopoverPage implements OnInit {
   ) {
 
     this.members = this.navParams.get('members');
-    console.log(this.members);
-    this.attendees = this.navParams.get('members').map((val)=>{
-      return {
-        Name: val.name,
-        EmailAddress: val.username+"@"+environment.domain,
-        IsRequired: "true",
-      }
-    });
+
+    if(this.members) {
+      this.attendees = this.navParams.get('members').map((val)=>{
+        return {
+          Name: val.name,
+          EmailAddress: val.username+"@"+environment.domain,
+          IsRequired: "true",
+        }
+      });
+    }
+
   }
 
   ngOnInit() {