diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index e105d4c40..bc9a802d3 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -41,6 +41,8 @@ export class AgendaPage implements OnInit { constructor( + private alertCtrl: AlertController, + @Inject(LOCALE_ID) private locale: string, private modalCtrl: ModalController, private eventService: EventsService, private router: Router 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 d99b25aee..edd319c68 100644 --- a/src/app/pages/events/event-detail/event-detail.page.html +++ b/src/app/pages/events/event-detail/event-detail.page.html @@ -1,16 +1,17 @@ - + Visualizar Evento - + Assunto + @@ -21,55 +22,36 @@ Localização - - - Pessoas - - - Agenda - - Pessoal - Oficial - + Intervenientes + + + + + - Selecione o tipo de evento - - Reunião - Viagem - Conferência - Encontro - + Calendário + - Data Início - + Tipo do evento + + + + Data Início: + Data Fim - + - - -
-
-
- -
-
-

Ver anexos

-
-
-
-
-
+ Anexos + + + Lei do orçamento geral do Estado +
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 1a8b53367..e51814f32 100644 --- a/src/app/pages/events/event-detail/event-detail.page.ts +++ b/src/app/pages/events/event-detail/event-detail.page.ts @@ -1,14 +1,11 @@ -import { Component, OnInit, Injectable } from '@angular/core'; -import { ActivatedRoute, NavigationExtras } from '@angular/router'; +import { Component, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; import { EventsService } from 'src/app/services/events.service'; - import { Router } from '@angular/router'; import { Event } from '../../../models/event.model'; +import { Observable } from 'rxjs'; import { EventBody } from 'src/app/models/eventbody.model'; import { AlertController } from '@ionic/angular'; -import { Attachment } from 'src/app/models/attachment.model'; -import { ActionSheetController } from '@ionic/angular'; - @Component({ selector: 'app-event-detail', @@ -17,12 +14,10 @@ import { ActionSheetController } from '@ionic/angular'; }) export class EventDetailPage implements OnInit { - public loadedEvent: Event; - loadedEventAttachments: Attachment[]; - showLoader: boolean = true; + loadedEvent: Event; + eventItem: Observable; - constructor(public actionSheetController: ActionSheetController, public alertController: AlertController, private router: Router, private activatedRoute: ActivatedRoute, - public eventsService: EventsService) { + constructor(public alertController: AlertController, private router: Router, private activatedRoute: ActivatedRoute, private eventsService: EventsService) { this.loadedEvent = new Event(); this.loadedEvent.Body = new EventBody(); } @@ -34,18 +29,18 @@ export class EventDetailPage implements OnInit { //Redirect return; } - this.loadEvent(paramMap.get('eventId')); - }); - } + const eventId = paramMap.get('eventId'); - loadEvent(eventid:string) - { - this.showLoader = true; - - this.eventsService.getEvent(eventid).subscribe(event => { - this.loadedEvent = event; - this.showLoader = false; - this.eventsService.loadedEvent = this.loadedEvent; + /* Load my event detail */ + /* this.loadedEvent = this.eventsService.getEvent(eventId); */ + this.eventItem = this.eventsService.getEvent(eventId); + + /* console.log(this.eventItem); */ + + this.eventsService.getEvent(eventId).subscribe(response => + { + this.loadedEvent = response; + }); }); } @@ -60,7 +55,7 @@ export class EventDetailPage implements OnInit { text: 'Não', role: 'cancel', cssClass: 'secondary', - handler: () => { } + handler: (blah) => { } }, { text: 'Sim', handler: () => { @@ -75,7 +70,7 @@ export class EventDetailPage implements OnInit { Delete() { - this.eventsService.deleteEvent(this.loadedEvent.EventId, 0).subscribe(async () => + this.eventsService.deleteEvent(this.loadedEvent.EventId, 0).subscribe(async response => { const alert = await this.alertController.create({ cssClass: 'my-custom-class', @@ -91,7 +86,7 @@ export class EventDetailPage implements OnInit { Save() { - this.eventsService.putEvent(this.loadedEvent, 2, 3).subscribe(async () => + this.eventsService.putEvent(this.loadedEvent, 2, 3).subscribe(async response => { const alert = await this.alertController.create({ cssClass: 'my-custom-class', @@ -105,12 +100,4 @@ export class EventDetailPage implements OnInit { }); } - openDetailsWithQueryParams() { - let navigationExtras: NavigationExtras = { - queryParams: { - special: JSON.stringify(this.loadedEvent.Attendees) - } - }; - this.router.navigate(['details'], navigationExtras); - } } diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index 5bc7a309c..0c55cbc22 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -1,5 +1,4 @@ -
- + @@ -23,7 +22,6 @@ -
@@ -36,7 +34,7 @@ - + Combinada @@ -57,7 +55,7 @@ -
+
@@ -90,7 +88,7 @@ -
+
@@ -108,7 +106,7 @@

{{event.Location}}

- +
@@ -123,7 +121,7 @@ -
+
diff --git a/src/app/pages/events/events.page.scss b/src/app/pages/events/events.page.scss index 8b09a9a84..0981a2ba5 100644 --- a/src/app/pages/events/events.page.scss +++ b/src/app/pages/events/events.page.scss @@ -1,8 +1,3 @@ -.header-toolbar{ - /* background: #f5f5f5; - border: 1px solid red; */ -} - /* HEADER */ .ion-text-header-top{ text-align: center; @@ -53,26 +48,11 @@ } //DIV - .div-item-Oficial{ + .div-item{ width: 100%; overflow: auto; - + border-bottom: 1px solid #ccc; margin: 10px 0 5px 0; - overflow: auto; - - background: #cab0dc; - padding: 5px; - border-radius: 10PX; - } - .div-item-Pessoal{ - width: 100%; - overflow: auto; - margin: 10px 0 5px 0; - overflow: auto; - - background: #cbeecb; - padding: 5px; - border-radius: 10PX; } .div-up{ width: 100%; @@ -100,7 +80,6 @@ float: left; border-left: 4px solid #cab0dc; padding: 0 0 0 12px; - } .div-content-Pessoal{ width: 85%; diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 4fb899a73..1c120b111 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,7 +4,7 @@ export const environment = { production: false, - apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/v2/api/', + apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/v1/api/', domain: 'gabinetedigital.local', defaultuser: 'tiago.kayaya', defaultuserpwd: 'tabteste@006'