diff --git a/src/app/pages/events/attachments/attachments.page.ts b/src/app/pages/events/attachments/attachments.page.ts
index ee9b08c71..815a6ce8c 100644
--- a/src/app/pages/events/attachments/attachments.page.ts
+++ b/src/app/pages/events/attachments/attachments.page.ts
@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
import { AttachmentsService } from 'src/app/services/attachments.service';
import { Attachment } from 'src/app/models/attachment.model';
import { ActivatedRoute } from '@angular/router';
+import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
@Component({
selector: 'app-attachments',
@@ -12,7 +13,7 @@ export class AttachmentsPage implements OnInit {
loadedEventAttachments: Attachment[];
- constructor(private attachamentsService: AttachmentsService, private activatedRoute: ActivatedRoute) { }
+ constructor(private attachamentsService: AttachmentsService, private activatedRoute: ActivatedRoute, private iab: InAppBrowser) { }
ngOnInit() {
/* Emit new data when something changes */
@@ -32,4 +33,10 @@ export class AttachmentsPage implements OnInit {
});
}
+ viewDocument(documenturl:string)
+ {
+ const browser = this.iab.create(documenturl);
+ browser.show();
+ }
+
}
diff --git a/src/app/pages/events/attendees/attendees-routing.module.ts b/src/app/pages/events/attendees/attendees-routing.module.ts
new file mode 100644
index 000000000..7c59381bf
--- /dev/null
+++ b/src/app/pages/events/attendees/attendees-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { AttendeesPage } from './attendees.page';
+
+const routes: Routes = [
+ {
+ path: '',
+ component: AttendeesPage
+ }
+];
+
+@NgModule({
+ imports: [RouterModule.forChild(routes)],
+ exports: [RouterModule],
+})
+export class AttendeesPageRoutingModule {}
diff --git a/src/app/pages/events/attendees/attendees.module.ts b/src/app/pages/events/attendees/attendees.module.ts
new file mode 100644
index 000000000..63a655038
--- /dev/null
+++ b/src/app/pages/events/attendees/attendees.module.ts
@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { AttendeesPageRoutingModule } from './attendees-routing.module';
+
+import { AttendeesPage } from './attendees.page';
+
+@NgModule({
+ imports: [
+ CommonModule,
+ FormsModule,
+ IonicModule,
+ AttendeesPageRoutingModule
+ ],
+ declarations: [AttendeesPage]
+})
+export class AttendeesPageModule {}
diff --git a/src/app/pages/events/attendees/attendees.page.html b/src/app/pages/events/attendees/attendees.page.html
new file mode 100644
index 000000000..4ad73a606
--- /dev/null
+++ b/src/app/pages/events/attendees/attendees.page.html
@@ -0,0 +1,40 @@
+
+
+ attendees
+
+
+
+
+
+
+
+
+
+
+ Necessários
+
+
+ Opcionais
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ attendee.Name }}
+
{{ attendee.EmailAddress }}
+
+
+
+
diff --git a/src/app/pages/events/attendees/attendees.page.scss b/src/app/pages/events/attendees/attendees.page.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/pages/events/attendees/attendees.page.spec.ts b/src/app/pages/events/attendees/attendees.page.spec.ts
new file mode 100644
index 000000000..d2cb216ae
--- /dev/null
+++ b/src/app/pages/events/attendees/attendees.page.spec.ts
@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { AttendeesPage } from './attendees.page';
+
+describe('AttendeesPage', () => {
+ let component: AttendeesPage;
+ let fixture: ComponentFixture
;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ AttendeesPage ],
+ imports: [IonicModule.forRoot()]
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(AttendeesPage);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ }));
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/pages/events/attendees/attendees.page.ts b/src/app/pages/events/attendees/attendees.page.ts
new file mode 100644
index 000000000..039e6e255
--- /dev/null
+++ b/src/app/pages/events/attendees/attendees.page.ts
@@ -0,0 +1,24 @@
+import { Component, OnInit, Injectable } from '@angular/core';
+import { EventPerson } from 'src/app/models/eventperson.model';
+import { ActivatedRoute } from '@angular/router';
+import { EventDetailPage } from '../event-detail/event-detail.page';
+import { EventsService } from 'src/app/services/events.service';
+
+@Component({
+ selector: 'app-attendees',
+ templateUrl: './attendees.page.html',
+ styleUrls: ['./attendees.page.scss'],
+})
+export class AttendeesPage implements OnInit {
+
+ eventAttendees: EventPerson[];
+ segment:string;
+
+ constructor(private activatedRoute: ActivatedRoute, public eventService: EventsService) {
+ }
+
+ ngOnInit() {
+ this.eventAttendees = this.eventService.loadedEvent.Attendees;
+ console.log(this.eventService.loadedEvent);
+ }
+}
diff --git a/src/app/pages/events/event-detail/event-detail.page.html b/src/app/pages/events/event-detail/event-detail.page.html
index 0aaea0ac2..d99b25aee 100644
--- a/src/app/pages/events/event-detail/event-detail.page.html
+++ b/src/app/pages/events/event-detail/event-detail.page.html
@@ -21,14 +21,12 @@
Localização
-
- Intervenientes
-
-
-
-
-
-
+
+
+ Pessoas
+
+
Agenda
diff --git a/src/app/pages/events/event-detail/event-detail.page.ts b/src/app/pages/events/event-detail/event-detail.page.ts
index eab8feefe..1a8b53367 100644
--- a/src/app/pages/events/event-detail/event-detail.page.ts
+++ b/src/app/pages/events/event-detail/event-detail.page.ts
@@ -1,5 +1,5 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
+import { Component, OnInit, Injectable } from '@angular/core';
+import { ActivatedRoute, NavigationExtras } from '@angular/router';
import { EventsService } from 'src/app/services/events.service';
import { Router } from '@angular/router';
@@ -9,6 +9,7 @@ import { AlertController } from '@ionic/angular';
import { Attachment } from 'src/app/models/attachment.model';
import { ActionSheetController } from '@ionic/angular';
+
@Component({
selector: 'app-event-detail',
templateUrl: './event-detail.page.html',
@@ -16,12 +17,12 @@ import { ActionSheetController } from '@ionic/angular';
})
export class EventDetailPage implements OnInit {
- loadedEvent: Event;
+ public loadedEvent: Event;
loadedEventAttachments: Attachment[];
showLoader: boolean = true;
constructor(public actionSheetController: ActionSheetController, public alertController: AlertController, private router: Router, private activatedRoute: ActivatedRoute,
- private eventsService: EventsService) {
+ public eventsService: EventsService) {
this.loadedEvent = new Event();
this.loadedEvent.Body = new EventBody();
}
@@ -44,6 +45,7 @@ export class EventDetailPage implements OnInit {
this.eventsService.getEvent(eventid).subscribe(event => {
this.loadedEvent = event;
this.showLoader = false;
+ this.eventsService.loadedEvent = this.loadedEvent;
});
}
@@ -102,4 +104,13 @@ export class EventDetailPage implements OnInit {
this.router.navigate(['/home/events']);
});
}
+
+ openDetailsWithQueryParams() {
+ let navigationExtras: NavigationExtras = {
+ queryParams: {
+ special: JSON.stringify(this.loadedEvent.Attendees)
+ }
+ };
+ this.router.navigate(['details'], navigationExtras);
+ }
}
diff --git a/src/app/pages/events/events-routing.module.ts b/src/app/pages/events/events-routing.module.ts
index 2d64075b0..ebc8e188b 100644
--- a/src/app/pages/events/events-routing.module.ts
+++ b/src/app/pages/events/events-routing.module.ts
@@ -15,6 +15,10 @@ const routes: Routes = [
{
path: 'attachments',
loadChildren: () => import('./attachments/attachments.module').then( m => m.AttachmentsPageModule)
+ },
+ {
+ path: 'attendees',
+ loadChildren: () => import('./attendees/attendees.module').then( m => m.AttendeesPageModule)
}
];
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index 032e4c11e..5b3a0605f 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -34,7 +34,6 @@ export class AuthService {
try {
result = await this.http.get(service, options).toPromise();
} catch(e) {
- console.log(e);
result = false;
}
diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts
index ce6b84de5..476c0715b 100644
--- a/src/app/services/events.service.ts
+++ b/src/app/services/events.service.ts
@@ -15,6 +15,7 @@ export class EventsService {
authheader = {};
loggeduser: User;
headers: HttpHeaders;
+ public loadedEvent: Event;
constructor(private http: HttpClient, user: AuthService) {
this.loggeduser = user.ValidatedUser;