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

src/app/pages/agenda/agenda.page.html

@@ -409,6 +409,9 @@
         (closeComponent)="approveEventDismissGoBack()"
         (setIntervenient)="setIntervenient($event)"
         (setIntervenientCC)="setIntervenientCC($event)"
+
+
+        (closeEventToApprove)="closeEventToApproveGoBack()"
       ></app-edit-event-to-approve>
 
       <app-attendee-modal
@@ -429,4 +432,4 @@
 
   </div>
 
-</ion-content>
+</ion-content>

src/app/pages/agenda/agenda.page.ts

@@ -338,15 +338,7 @@ export class AgendaPage implements OnInit {
       let classs = [];
 
       events.forEach(element => {
-
-        const startTimeSamp = new Date(element.startTime).toLocaleDateString()
-        const endTimeSamp = new Date(element.endTime).toLocaleDateString()
-
-        const endMinutes = new Date(element.endTime).getMinutes()
-        const endHours = new Date(element.endTime).getHours() 
-        const endDay: number = new Date(element.endTime).getDate()
-        const startDay = new Date(element.startTime).getDate()
-
+        
         const profile_ = element.profile == 'md'? 'mdgpr': 'pr';
         const eventtype = element.event.CalendarName;
 

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

@@ -15,6 +15,7 @@ import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-
 import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
 import { ToastService } from 'src/app/services/toast.service';
 import { EliminateEventPage } from 'src/app/modals/eliminate-event/eliminate-event.page';
+import { Location } from '@angular/common'
 
 @Component({
   selector: 'app-view-event',
@@ -58,6 +59,7 @@ export class ViewEventPage implements OnInit {
     private activatedRoute: ActivatedRoute,
     private router: Router,
     private toastService: ToastService,
+    private location: Location
   )
   {
     this.isEventEdited = false;
@@ -109,14 +111,16 @@ export class ViewEventPage implements OnInit {
     if(this.isModal) {
       this.close()
     } else {
-      this.activatedRoute.paramMap.subscribe(params => {
-        if(params["params"].caller == 'expediente'){
-          window.history.back();
-        }
-        else{
-          this.router.navigate(['/home',params["params"].caller]);
-        }
-      });
+        // this.activatedRoute.paramMap.subscribe(params => {
+        //   if(params["params"].caller == 'expediente'){
+        //     window.history.back();
+        //   }
+        //   else{
+        //     this.router.navigate(['/home',params["params"].caller]);
+        //   }
+        // });
+
+      this.location.back();
     }
 
   }
@@ -128,13 +132,17 @@ export class ViewEventPage implements OnInit {
       /* this.today = new Date(res.StartDate);
       this.customDate = this.days[this.today.getDay()]+ ", "  + this.today.getDate() +" de "  + ( this.months[this.today.getMonth()]); */
       loader.remove()
-    }, ()=>{
+    }, (error)=>{
       
-      loader.remove()
-      this.toastService.badRequest('Este evento já não existe na sua agenda')
-      this.modalController.dismiss('Eevent not Foud');
-      this.router.navigate(['/home/agenda']);
+      if(error.status == 0) {
+        this.toastService.badRequest('não é possível  vizualizar este event no modo offline')
+      } else {
+        this.toastService.badRequest('Este evento já não existe na sua agenda')
+      } 
 
+      loader.remove()
+      this.modalController.dismiss('Eevent not Foud');
+      this.location.back();
     });
   }