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

src/app/pages/events/event-detail/event-detail.page.html

@@ -1,7 +1,7 @@
 <ion-header>
   <ion-toolbar>
     <ion-buttons slot="start">
-      <ion-back-button defaultHref="/home/events"></ion-back-button>
+      <ion-back-button defaultHref="{{ backURL }}"></ion-back-button>
     </ion-buttons>
     <ion-title>Visualizar Evento</ion-title>
     <ion-buttons slot="end">
@@ -57,7 +57,7 @@
     <ion-item>
         <ion-label position="stacked">Data Fim</ion-label>
         <ion-datetime value="{{loadedEvent.EndDate}}" [(ngModel)]="loadedEvent.EndDate" min="2020" max="2100"
-          displayFormat="D MMM YYYY H:mm"
+          displayFormat="D MMM YYYY HH:mm"
           monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"></ion-datetime>
     </ion-item>
     <!-- <div class="div-card-button">

src/app/pages/events/event-detail/event-detail.page.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, Injectable } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { EventsService } from 'src/app/services/events.service';
 import { Router } from '@angular/router';
@@ -22,6 +22,9 @@ export class EventDetailPage implements OnInit {
   loadedEventAttachments: Attachment[];
   pageId: string;
   showLoader: boolean;
+  backURL: string;
+
+  minDate: Date;
 
 
   constructor(public alertController: AlertController, 
@@ -40,20 +43,31 @@ export class EventDetailPage implements OnInit {
 
   loadEvent()
   {
+    let eventid: string;
+
     this.activatedRoute.paramMap.subscribe(paramMap =>
       {
         if (!paramMap.has("eventId"))
         {
           return;
         }
-        this.pageId = paramMap.get('eventId');
-        this.eventsService.getEvent(paramMap.get('eventId')).subscribe(response => 
-          {
-            this.loadedEvent = response;
-            //this.eventsService.lastloadedevent = this.loadedEvent;
-          });
+        else
+        {
+          this.pageId = paramMap.get('eventId');
+          eventid = paramMap.get('eventId');
+        }
+
+        if (paramMap.has("caller"))
+        {
+          this.backURL = "/home/" + paramMap.get('caller');
+        }
       }
     );
+    
+    this.eventsService.getEvent(eventid).subscribe(response => 
+      {
+        this.loadedEvent = response;
+      });
   }
 
   async openAttendees()
@@ -139,8 +153,6 @@ export class EventDetailPage implements OnInit {
         });
     
         await alert.present();
-
-        this.router.navigate(['/home/events']);
       });  
   }
 
@@ -160,4 +172,8 @@ export class EventDetailPage implements OnInit {
   
 
 
+  back()
+  {
+    //this.back();
+  }
 }

src/app/pages/events/events.page.html

@@ -79,7 +79,7 @@
         <ion-item-sliding>
           <ion-item lines="none" 
           *ngFor="let event of eventsList"
-          [routerLink]="['/home/events', event.EventId]">
+          [routerLink]="['/home/events', event.EventId, 'events']">
             <div class="div-item-{{event.CalendarName}}">
               <div class="div-up">
                 <div class="div-icon">

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

@@ -77,7 +77,6 @@ export class EventsPage implements OnInit {
         .subscribe(response => {
             this.eventsList = response;
             this.showLoader = false;
-            console.log(response[0].HasAttachments);
           }
         );
         break;