merge

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

@@ -213,7 +213,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     } catch (err) { }
   }
 
-  async goToEvent(eventId: any) {
+  async goToEvent(event: any) {
     let classs;
     if (window.innerWidth < 701) {
       classs = 'modal modal-desktop'
@@ -224,7 +224,8 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     const modal = await this.modalController.create({
       component: ViewEventPage,
       componentProps: {
-        eventId: eventId,
+        eventId: event.id,
+        CalendarId: event.calendarId
       },
       cssClass: classs,
     });
@@ -1103,19 +1104,21 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
 
   async openPreview(msg) {
 
+
     if (msg.file.type === "application/webtrix") {
       this.viewDocument(msg.file, msg.attachments.image_url)
     } else {
 
       if (!msg.attachments[0].image_url || msg.attachments[0].image_url === null || msg.attachments[0].image_url === '') {
         this.downloadFileMsg(msg)
+        //this.testDownlod(msg)
 
       } else {
-
         var str = msg.attachments[0].image_url;
         str = str.substring(1, ((str.length) - 1));
 
         if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
+
           console.log(msg)
           if (msg.file.type == "application/img") {
             const modal = await this.modalController.create({
@@ -1136,17 +1139,6 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
           this.openFile(str, msg.attachments[0].name, msg.file.type);
         }
 
-        /* const modal = await this.modalController.create({
-          component: ViewMediaPage,
-          cssClass: 'modal modal-desktop',
-          componentProps: {
-            image: str,
-            type: msg.file.type,
-            username: msg.u.name,
-            _updatedAt: msg._updatedAt
-          }
-        });
-        modal.present(); */
       }
     }