diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts index 9eb9208a5..ea9eb57db 100644 --- a/src/app/home/home-routing.module.ts +++ b/src/app/home/home-routing.module.ts @@ -34,10 +34,6 @@ const routes: Routes = [ { path: 'attachments', children: [ - { - path:'', - loadChildren: ()=> import('../pages/events/attachments/attachments.module').then(m => m.AttachmentsPageModule) - }, { path:':eventId', loadChildren: ()=> import('../pages/events/attachments/attachments.module').then(m => m.AttachmentsPageModule) diff --git a/src/app/pages/cal-modal/cal-modal.page.html b/src/app/pages/cal-modal/cal-modal.page.html index 1f377bb00..2cd0a10e8 100644 --- a/src/app/pages/cal-modal/cal-modal.page.html +++ b/src/app/pages/cal-modal/cal-modal.page.html @@ -12,47 +12,26 @@
- Assunto + Assunto - - Descrição - + Descrição + - Localização + Localização - - - Selecione a Agenda + Selecione a Agenda Pessoal Oficial - Tipo de evento + Tipo de evento Reunião Viagem @@ -61,13 +40,13 @@ - Data Início + Data Início - Data Fim + Data Fim @@ -88,8 +67,6 @@
- - 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 77867a15d..9900deffd 100644 --- a/src/app/pages/events/event-detail/event-detail.page.html +++ b/src/app/pages/events/event-detail/event-detail.page.html @@ -13,114 +13,124 @@ -
+
Assunto - + - - - Campo obrigatório -
- - Descrição - - - - Localização - - - - Calendário - - Pessoal - Oficial - - - - Tipo do evento - - Reunião - Viagem - Conferência - Encontro - - - - Data Início - - - - - Data Fim - + Descrição + + + + Localização + + + + Calendário + + Pessoal + Oficial + + + + Tipo do evento + + Reunião + Viagem + Conferência + Encontro + + + + Data Início + - -
- - - -
- -
- - - - Intervenientes - - - - - -
- -
- - - - Anexos - - -
- + + +
+ + + + Ver mais + + Intervenientes + +
+ + + + {{attendee.Name}} + + +
+
+ + + + + Ver mais + + Anexos - -
--> - + + + + + + + + + +

{{ att.Description }}

+

{{ att.CreateDate }}

+ + + + + + Sem anexos + + + +
+
diff --git a/src/app/pages/events/event-detail/event-detail.page.scss b/src/app/pages/events/event-detail/event-detail.page.scss index 91ef2ba43..3c2e0a07a 100644 --- a/src/app/pages/events/event-detail/event-detail.page.scss +++ b/src/app/pages/events/event-detail/event-detail.page.scss @@ -80,4 +80,4 @@ ion-card{ font-size: 12px; font-weight: bold; padding-bottom: 20px; -} \ No newline at end of file +} 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 4c52f2037..2a2201bb5 100644 --- a/src/app/pages/events/event-detail/event-detail.page.ts +++ b/src/app/pages/events/event-detail/event-detail.page.ts @@ -7,8 +7,12 @@ import { EventBody } from 'src/app/models/eventbody.model'; import { AlertController, ModalController } from '@ionic/angular'; import { EventPerson } from 'src/app/models/eventperson.model'; import { AttendeesPage } from 'src/app/pages/events/attendees/attendees.page'; +import { AlertService } from 'src/app/services/alert.service'; +import { Attachment } from 'src/app/models/attachment.model'; +import { AttachmentsService } from 'src/app/services/attachments.service'; import { FormGroup, FormBuilder, Validators } from "@angular/forms"; + @Component({ selector: 'app-event-detail', templateUrl: './event-detail.page.html', @@ -17,19 +21,28 @@ import { FormGroup, FormBuilder, Validators } from "@angular/forms"; export class EventDetailPage implements OnInit { loadedEvent: Event; + loadedEventAttachments: Attachment[]; + pageId: string; + showLoader: boolean; backURL: string; ionicForm: FormGroup; isSubmitted = false; minDate: Date; - constructor(public formBuilder: FormBuilder, public alertController: AlertController, private router: Router, private activatedRoute: ActivatedRoute, private eventsService: EventsService, private modalCtrl: ModalController) { + + constructor(public formBuilder: FormBuilder, public alertController: AlertController, + private router: Router, private activatedRoute: ActivatedRoute, + private eventsService: EventsService, private modalCtrl: ModalController, + private alertService: AlertService, + private attachamentsService: AttachmentsService) { this.loadedEvent = new Event(); this.loadedEvent.Body = new EventBody(); } ngOnInit() { this.loadEvent(); + this.loadAttachments(); this.ionicForm = this.formBuilder.group({ subject: ['', [Validators.required]] }) @@ -51,6 +64,7 @@ export class EventDetailPage implements OnInit { } else { + this.pageId = paramMap.get('eventId'); eventid = paramMap.get('eventId'); } @@ -60,7 +74,7 @@ export class EventDetailPage implements OnInit { } } ); - + this.eventsService.getEvent(eventid).subscribe(response => { this.loadedEvent = response; @@ -156,8 +170,32 @@ export class EventDetailPage implements OnInit { } } + showAlert(){ + this.alertService.presentAlert("Funcionalidade em desenvolvimento"); + } + + loadAttachments() + { + console.log(this.pageId); + this.attachamentsService.getEventAttachments(this.pageId).subscribe(attachments => { + this.loadedEventAttachments = attachments; + console.log(attachments); + }); + } + + + + back() { //this.back(); } + doRefresh(event){ + /* this.RefreshEvents(); */ + event.target.complete(); + setTimeout(() => { + event.target.complete(); + }, 2000); + + } } diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 4fb899a73..dd2e51b11 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -6,7 +6,7 @@ export const environment = { production: false, apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/v2/api/', domain: 'gabinetedigital.local', - defaultuser: 'tiago.kayaya', + defaultuser: 'paulo.pinto', defaultuserpwd: 'tabteste@006' };