Merge branch 'bugfix/image-modal-accoes' into develop

package.json

@@ -133,6 +133,7 @@
     "g": "^2.0.1",
     "global": "^4.4.0",
     "hammerjs": "^2.0.8",
+    "howler": "^2.2.3",
     "http-server": "^14.1.1",
     "i": "^0.3.7",
     "ionic-angular": "^3.9.10",

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/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 => {
       //