diff --git a/src/app/pages/events/attendee-modal/attendee-modal-routing.module.ts b/src/app/pages/events/attendee-modal/attendee-modal-routing.module.ts new file mode 100644 index 000000000..384a9efd2 --- /dev/null +++ b/src/app/pages/events/attendee-modal/attendee-modal-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { AttendeeModalPage } from './attendee-modal.page'; + +const routes: Routes = [ + { + path: '', + component: AttendeeModalPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class AttendeeModalPageRoutingModule {} diff --git a/src/app/pages/events/attendee-modal/attendee-modal.module.ts b/src/app/pages/events/attendee-modal/attendee-modal.module.ts new file mode 100644 index 000000000..e97fd7610 --- /dev/null +++ b/src/app/pages/events/attendee-modal/attendee-modal.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 { AttendeeModalPageRoutingModule } from './attendee-modal-routing.module'; + +import { AttendeeModalPage } from './attendee-modal.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + AttendeeModalPageRoutingModule + ], + declarations: [AttendeeModalPage] +}) +export class AttendeeModalPageModule {} diff --git a/src/app/pages/events/attendee-modal/attendee-modal.page.html b/src/app/pages/events/attendee-modal/attendee-modal.page.html new file mode 100644 index 000000000..72b4b4337 --- /dev/null +++ b/src/app/pages/events/attendee-modal/attendee-modal.page.html @@ -0,0 +1,30 @@ + + + attendee-modal + + + + + + + + + + + + + + Cancelar + + + + + + Gravar + + + + + \ No newline at end of file diff --git a/src/app/pages/events/attendee-modal/attendee-modal.page.scss b/src/app/pages/events/attendee-modal/attendee-modal.page.scss new file mode 100644 index 000000000..e69de29bb diff --git a/src/app/pages/events/attendee-modal/attendee-modal.page.spec.ts b/src/app/pages/events/attendee-modal/attendee-modal.page.spec.ts new file mode 100644 index 000000000..f247abe63 --- /dev/null +++ b/src/app/pages/events/attendee-modal/attendee-modal.page.spec.ts @@ -0,0 +1,24 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { AttendeeModalPage } from './attendee-modal.page'; + +describe('AttendeeModalPage', () => { + let component: AttendeeModalPage; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ AttendeeModalPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(AttendeeModalPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/pages/events/attendee-modal/attendee-modal.page.ts b/src/app/pages/events/attendee-modal/attendee-modal.page.ts new file mode 100644 index 000000000..9ac59ab45 --- /dev/null +++ b/src/app/pages/events/attendee-modal/attendee-modal.page.ts @@ -0,0 +1,49 @@ +import { Component, OnInit } from '@angular/core'; +import { ModalController } from '@ionic/angular'; + +@Component({ + selector: 'app-attendee-modal', + templateUrl: './attendee-modal.page.html', + styleUrls: ['./attendee-modal.page.scss'], +}) +export class AttendeeModalPage implements OnInit { + + constructor(private modalCtrl: ModalController) { } + + ngOnInit() { + } + + save(){ + //this.eventService.postEvent(this.postEvent, this.postEvent.CalendarName).subscribe(); + this.modalCtrl.dismiss(); + } + + close(){ + this.modalCtrl.dismiss(); + } + + onChange(evt: any) { + console.log(evt); + } + + searchCountry(searchbar) { + // reset countries list with initial call + //this.eventAttendees = this.eventAttendeesInitial; + + // set q to the value of the searchbar + var q = searchbar.value; + + // if the value is an empty string don't filter the items + // if (q.trim() == '') { + // return; + // } + + // this.eventAttendees = this.eventAttendees.filter((v) => { + // if (v.Name.toLowerCase().indexOf(q.toLowerCase()) > -1) { + // return true; + // } + // return false; + // }) + } + +} diff --git a/src/app/pages/events/attendees/attendees.page.html b/src/app/pages/events/attendees/attendees.page.html index 503fc3a4e..ecbd5ce25 100644 --- a/src/app/pages/events/attendees/attendees.page.html +++ b/src/app/pages/events/attendees/attendees.page.html @@ -3,18 +3,8 @@ attendees - - - - - - - - + + + + Adicionar intervenientes + + \ No newline at end of file diff --git a/src/app/pages/events/attendees/attendees.page.ts b/src/app/pages/events/attendees/attendees.page.ts index cde2b7a50..96f05f7f5 100644 --- a/src/app/pages/events/attendees/attendees.page.ts +++ b/src/app/pages/events/attendees/attendees.page.ts @@ -1,6 +1,8 @@ import { Component, OnInit } from '@angular/core'; import { EventPerson } from 'src/app/models/eventperson.model'; import { EventsService } from 'src/app/services/events.service'; +import { ModalController } from '@ionic/angular'; +import { AttendeeModalPage } from '../attendee-modal/attendee-modal.page'; @Component({ selector: 'app-attendees', @@ -16,7 +18,7 @@ export class AttendeesPage implements OnInit { searchCountryString = ''; // initialize your searchCountryString string empty - constructor(private eventService: EventsService) { + constructor(private eventService: EventsService, private modalCtrl: ModalController) { } @@ -28,26 +30,6 @@ export class AttendeesPage implements OnInit { this.loadAttendees(); } - searchCountry(searchbar) { - // reset countries list with initial call - this.eventAttendees = this.eventAttendeesInitial; - - // set q to the value of the searchbar - var q = searchbar.value; - - // if the value is an empty string don't filter the items - // if (q.trim() == '') { - // return; - // } - - this.eventAttendees = this.eventAttendees.filter((v) => { - if (v.Name.toLowerCase().indexOf(q.toLowerCase()) > -1) { - return true; - } - return false; - }) - } - loadAttendees(){ let isRequired: boolean = (this.segment == "required"); this.eventAttendees = this.eventService.lastloadedevent.Attendees.filter(function(person) { @@ -55,8 +37,16 @@ export class AttendeesPage implements OnInit { }); this.eventAttendeesInitial = this.eventAttendees; } - - onChange(evt: any) { - console.log(evt); + + async addAttendees() + { + const modal = await this.modalCtrl.create({ + component: AttendeeModalPage, + cssClass: 'attendee-modal', + backdropDismiss: false + }); + await modal.present(); + modal.onDidDismiss(); } -} + +} \ No newline at end of file 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 4d148bdbb..7ae0cdeab 100644 --- a/src/app/pages/events/event-detail/event-detail.page.html +++ b/src/app/pages/events/event-detail/event-detail.page.html @@ -51,9 +51,11 @@ + +
Apagar Gravar
- +
diff --git a/src/app/pages/events/events-routing.module.ts b/src/app/pages/events/events-routing.module.ts index ebc8e188b..a102b735b 100644 --- a/src/app/pages/events/events-routing.module.ts +++ b/src/app/pages/events/events-routing.module.ts @@ -19,6 +19,10 @@ const routes: Routes = [ { path: 'attendees', loadChildren: () => import('./attendees/attendees.module').then( m => m.AttendeesPageModule) + }, + { + path: 'attendee-modal', + loadChildren: () => import('./attendee-modal/attendee-modal.module').then( m => m.AttendeeModalPageModule) } ]; diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 1c120b111..dd2e51b11 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,9 +4,9 @@ export const environment = { production: false, - apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/v1/api/', + apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/v2/api/', domain: 'gabinetedigital.local', - defaultuser: 'tiago.kayaya', + defaultuser: 'paulo.pinto', defaultuserpwd: 'tabteste@006' };