Merge branch 'release/0.3'

android/app/src/main/assets/capacitor.config.json

@@ -16,5 +16,8 @@
 				"sound"
 			]
 		}
+	},
+	"server": {
+		"url": "http://192.168.0.60:8100"
 	}
 }

src/app/modals/view-media/view-media.page.html

@@ -20,18 +20,18 @@
       <ion-slides style="width: 100%; height: 100%;" [options]="sliderOpts">
         <ion-slide>
           <div class="swiper-zoom-container">
-            <div *ngIf="type == 'application/img'">
+            <div>
               <img src="{{image}}">
             </div>
-            <div *ngIf="type == 'application/pdf'">
-              <iframe width="100%" height="100%" [src]="base64Sanitize" type="application/vnd.openxmlformats-officedocument.wordprocessingml.document"></iframe>
+            <!-- <div *ngIf="type == 'application/pdf'">
+              <iframe width="100%" height="100%" [src]="base64Sanitize" type="application/vnd.openxmlformats-officedocument.wordprocessingml.document"></iframe> -->
               
               <!-- <pdf-viewer [src]="image"
               [render-text]="true"
               [original-size]="false"
               style="width: 400px; height: 500px"
   ></pdf-viewer> -->
-            </div>
+            <!-- </div> -->
           </div>
         </ion-slide>
       </ion-slides>

src/app/pages/agenda/view-event/view-event.page.html

@@ -57,7 +57,7 @@
             <ion-label>
               <p>{{customDate}}</p>
               <p>das {{loadedEvent.StartDate | date: 'HH:mm'}} às {{loadedEvent.EndDate | date: 'HH:mm'}}</p>
-              <p>
+              <p *ngIf="loadedEvent.EventRecurrence">
                 <span *ngIf="loadedEvent.EventRecurrence.Type == 0">Diário</span>
                 <span *ngIf="loadedEvent.EventRecurrence.Type == 1">Semanal</span>
                 <span *ngIf="loadedEvent.EventRecurrence.Type == 2">Mensal</span>

src/app/pages/agenda/view-event/view-event.page.ts

@@ -166,7 +166,9 @@ export class ViewEventPage implements OnInit {
           window.history.back();
         }
         else {
-          this.router.navigate(['/home', params["params"].caller]);
+          // this.router.navigate(['/home', params["params"].caller]);
+          this.RouteService.goBack();
+          
         }
       });
     }

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

@@ -83,6 +83,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
   showAvatar = true;
   audioPermissionStatus: 'granted'| 'denied' | 'prompt' | null = null
   sessionStore = SessionStore
+  isAdmin = false;
   constructor(
     private modalController: ModalController,
     public popoverController: PopoverController,
@@ -364,7 +365,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
     } catch (err) { }
   }
 
-  getRoomInfo() {
+  async getRoomInfo() {
     this.showLoader = true;
     // this.chatService.getRoomInfo(this.roomId).subscribe(room => {
     //   this.room = room['room'];
@@ -375,6 +376,24 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
     //   this.getGroupContacts(this.room);
     //   this.showLoader = false;
     // });
+    this.wsChatMethodsService.getGroupRoom(this.roomId).loadHistory({});
+    let room = await this.chatService.getRoomInfo(this.roomId).toPromise();
+    // console.log('ROOM',room)
+    this.room = room['room'];
+    if (this.room.name) {
+      this.roomName = this.room.name.split('-').join(' ');
+    }
+    
+
+    if(SessionStore.user.ChatData.data.userId == this.room.u._id){
+      this.isAdmin = true
+    } else {
+      this.isAdmin = false
+    }
+
+    if (this.room.customFields.countDownDate) {
+      this.roomCountDownDate = this.room.customFields.countDownDate;
+    }
   }
 
   async getChatMembers() {
@@ -509,6 +528,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
       componentProps: {
         roomId: this.roomId,
         members: this.members,
+        isAdmin: this.isAdmin,
       },
     });
     await modal.present();

src/app/pages/events/events.page.ts

@@ -24,6 +24,7 @@ import { ThemeService } from 'src/app/services/theme.service'
 import { Storage } from '@ionic/storage';
 import { PermissionList } from 'src/app/models/permission/permissionList';
 import { PermissionService } from 'src/app/services/permission.service';
+import { ViewEventPage } from 'src/app/modals/view-event/view-event.page';
 @Component({
   selector: 'app-events',
   templateUrl: './events.page.html',
@@ -471,6 +472,22 @@ export class EventsPage implements OnInit {
 
   }
 
+  async openEventDetail(id: any) {
+    // 
+
+    const modal = await this.modalController.create({
+      component: ViewEventPage,
+      componentProps: {
+        eventId: id,
+      },
+      cssClass: 'view-event',
+      backdropDismiss: false
+    });
+    await modal.present();
+    modal.onDidDismiss();
+
+  }
+
   LoadList() {
     this.processes.GetTaskListExpediente(false).subscribe(result => {
       //