Merge branch 'bugfix/chat-create-event' into develop_bitOut

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

@@ -240,6 +240,7 @@
         </app-group-messages>
 
         <app-new-event
+          *ngIf="showNewEvent"
           [profile]=""
           [roomId]="groupRoomId"
           [selectedSegment]=segment
@@ -250,6 +251,8 @@
           (onAddEvent)="closeNewEventComponent()"
           (openAttendeesComponent)="openAttendeesComponent($event)"
           (cloneAllmobileComponent)="closeNewEventComponent()"
+          (setIntervenient)="setIntervenient($event)"
+          (setIntervenientCC)="setIntervenientCC($event)"
           [style.display]="showNewEvent ? 'flex' : 'none'"
           class=" height-100 flex-column">
         </app-new-event>

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

@@ -108,10 +108,11 @@
                     <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-icon *ngIf="msg.attachments[0].type != 'webtrix'" name="document" class="file-icon"></ion-icon>
+                          <ion-icon  *ngIf="msg.attachments[0].type == 'webtrix'" src="assets/icon/webtrix.svg" 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 == 'default' && msg.attachments[0].type != 'webtrix' " 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-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.attachments[0].type != 'webtrix' " 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">

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

@@ -107,10 +107,11 @@
 
                       <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-icon *ngIf="msg.attachments[0].type != 'webtrix'" name="document" class="file-icon"></ion-icon>
+                          <ion-icon  *ngIf="msg.attachments[0].type == 'webtrix'" src="assets/icon/webtrix.svg" 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 == 'default' && msg.attachments[0].type != 'webtrix' " 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-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.attachments[0].type != 'webtrix' " class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
                         </ion-item>
                       </div>
 

src/app/shared/agenda/new-event/new-event.page.ts

@@ -472,10 +472,12 @@ export class NewEventPage implements OnInit {
     else if(this.loggeduser.Profile == 'PR') {
       
       const CalendarId = this.selectedCalendarId()
+      let loader = this.toastService.loading();
       
       this.eventService.postEventGeneric(this.postEvent, this.postEvent.CalendarName, CalendarId).subscribe(
         (id) => {
           
+          loader.remove()
 
           const eventId: any =  id;
 
@@ -503,7 +505,21 @@ export class NewEventPage implements OnInit {
           if(DocumentToSave.length == 0){
             this.afterSave();
           }
+          this.toastService._successMessage('Evento criado');
+          let data = {
+            "subject": this.postEvent.Subject,
+            "start": this.postEvent.StartDate,
+            "end": this.postEvent.EndDate,
+            "venue": this.postEvent.Location,
+            "id": id,
+          }
+          this.chatMethodService.sendMessage(this.roomId,data);
+
           this.toastService._successMessage('Evento criado')
+        },()=>{
+          loader.remove()
+          this.showLoader = false
+          this.toastService._badRequest('Evento não criado')
         });
     } else {
 
@@ -511,9 +527,11 @@ export class NewEventPage implements OnInit {
 
 
       const CalendarId = this.selectedCalendarId()
+      let loader = this.toastService.loading();
       
       this.eventService.postEventGeneric(this.postEvent, this.postEvent.CalendarName, CalendarId).subscribe(
         (id) => {
+          loader.remove();
 
           const eventId: any =  id;
 
@@ -541,7 +559,21 @@ export class NewEventPage implements OnInit {
           if(DocumentToSave.length == 0){
             this.afterSave();
           }
+
+          this.toastService._successMessage('Evento criado');
+          let data = {
+            "subject": this.postEvent.Subject,
+            "start": this.postEvent.StartDate,
+            "end": this.postEvent.EndDate,
+            "venue": this.postEvent.Location,
+            "id": id,
+          }
+          this.chatMethodService.sendMessage(this.roomId,data);
           this.toastService._successMessage('Evento criado')
+      },()=>{
+        loader.remove()
+        this.showLoader = false
+        this.toastService._badRequest('Evento não criado')
       });
 
     }
@@ -627,7 +659,7 @@ export class NewEventPage implements OnInit {
       return true;
     } else {
 
-      return false;
+      
     }
   }
 

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

@@ -112,10 +112,11 @@
                         <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-icon *ngIf="msg.attachments[0].type != 'webtrix'" name="document" class="file-icon"></ion-icon>
+                              <ion-icon  *ngIf="msg.attachments[0].type == 'webtrix'" src="assets/icon/webtrix.svg" 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 == 'default' && msg.attachments[0].type != 'webtrix' " 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-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.attachments[0].type != 'webtrix' " 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">
@@ -230,10 +231,8 @@
 </ion-content>
 
 <ion-footer>
-  <!-- <div class="typing" *ngIf="wsChatMethodsService.getGroupRoom(roomId).otherUserType == true" >A escrever...</div> -->
 
   <div class="typing" *ngIf="wsChatMethodsService.getGroupRoom(roomId).otherUserType == true">
-    {{ wsChatMethodsService.getGroupRoom(roomId).otherUserType }}
 
     <ngx-letters-avatar *ngIf="showAvatar"
     [avatarName]=  "wsChatMethodsService.getGroupRoom(roomId).name"

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

@@ -220,14 +220,10 @@
   <div class="width-100 pl-20 pr-20">
     <span *ngIf="!lastAudioRecorded">{{durationDisplay}}</span>
     <div class=" audioDiv d-flex width-100 mt-10 mb-10" *ngIf="lastAudioRecorded">
-    <!-- <button class="audioButtonPlay" fill="clear" (click)="start(audioRecorded)" *ngIf="!isPlaying"> <ion-icon slot="icon-only" name="play"></ion-icon> </button>
-    <button class="audioButtonPlay" fill="clear" (click)="togglePlayer(true)" *ngIf="isPlaying"> <ion-icon slot="icon-only" name="pause"></ion-icon> </button> -->
     <div (click)="start(audioRecorded)" *ngIf="!isPlaying" > <ion-icon slot="icon-only" name="play"></ion-icon> </div>
     <div (click)="togglePlayer(isPlaying)" *ngIf="isPlaying"> <ion-icon slot="icon-only" name="pause"></ion-icon> </div>
-    <!-- <label>{{audioDuration}}</label> -->
     <ion-range #range [(ngModel)]="audioProgress" max="100" (mouseup)="seek()"></ion-range>
     </div>
-    <!-- <audio [src]="audioRecorded" class="d-flex width-100 mt-10 mb-10" *ngIf="lastAudioRecorded" controls controlsList="nodownload noplaybackrate"></audio> -->
   </div>
 
   <div class="container width-100 d-flex">

src/global.scss

@@ -1196,6 +1196,7 @@ ngx-mat-datetime-content{
   width: 100%;
   background: none;
   padding: 10px 5px 10px 5px;
+  color: black;
 }
 .menuButton:hover{
   background: #e6f6ff75;