diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 5f114a479..5f96b58a0 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -4,13 +4,13 @@ - + Combinada - + Oficial - + Pessoal @@ -31,86 +31,170 @@ --> + - + + refreshingText="A actualizar..."> - - - - - - - - - - - - - - -

{{ viewTitle }}

- - - - - - - - - - - - +
+
+ + + + + + + + + +

{{ viewTitle }}

+ + + + + + + + + + + + - - -
- {{view.dates[row*7+col].label}} -
-
-
+ + +
+ {{view.dates[row*7+col].label}} +
+
+
+
+
- +
+ + + + + + + + + +

{{ viewTitle }}

+ + + + + + + + + + + + - - - - - - + + +
+ {{view.dates[row*7+col].label}} +
+
+
+
+ + +
+
+ + + + + + + + + +

{{ viewTitle }}

+ + + + + + + + + + + + + + + +
+ {{view.dates[row*7+col].label}} +
+
+
+
+ + +
+ + + + + +
\ No newline at end of file diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index d327d683a..bc9a802d3 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -4,10 +4,8 @@ import { AlertController, ModalController } from '@ionic/angular'; import { formatDate } from '@angular/common'; import { CalModalPage } from '../cal-modal/cal-modal.page'; import { EventsService } from 'src/app/services/events.service'; -import { Observable, ObjectUnsubscribedError } from 'rxjs'; import { Event } from '../../models/event.model'; -import { parse } from 'date-fns'; -import { Router } from '@angular/router'; +import { Router, NavigationEnd } from '@angular/router'; @Component({ selector: 'app-agenda', @@ -33,10 +31,14 @@ export class AgendaPage implements OnInit { segment:string; eventsList: Event[]; - responseEventId:string = ''; + eventsListPessoal: Event[]; + eventsListOficial: Event[]; + + showLoader: boolean = true; + + startTime: Date; + endTime: Date; - loadedEvent: Event; - eventItem: Observable; constructor( private alertCtrl: AlertController, @@ -48,7 +50,13 @@ export class AgendaPage implements OnInit { ngOnInit() { //Inicializar segment - this.segment = "combinada"; + this.segment = "Combinada"; + + this.router.events.forEach((event) => { + if(event instanceof NavigationEnd && event.url == this.router.url) { + this.loading(); + } + }); } //Go to the next view of the calendar month/week/day @@ -65,7 +73,6 @@ export class AgendaPage implements OnInit { } //Show information of the event async onEventSelected(ev: { event: Event}){ - console.log(ev.event.EventId); this.router.navigate(["/home/events", ev.event.EventId]); } @@ -81,36 +88,90 @@ export class AgendaPage implements OnInit { }); await modal.present(); modal.onDidDismiss(); - this.loading(); + /* this.loading(); */ } - + + async loadRangeEvents(startTime: Date, endTime: Date){ - this.eventService.getAllEvents(formatDate(startTime, 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(endTime, 'yyyy-MM-dd HH:mm:ss', 'pt')).subscribe( - response => { - this.eventsList = response; - this.eventsList.forEach(element => { - this.eventSource.push({ - title: element.Subject, - startTime: new Date(element.StartDate), - endTime: new Date(element.EndDate), - allDay: false, - event: element + this.showLoader = true; + switch (this.segment) + { + case "Combinada": + //Inicializa o array eventSource + this.eventSource=[]; + this.eventService.getAllEvents(formatDate(startTime, 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(endTime, 'yyyy-MM-dd HH:mm:ss', 'pt')).subscribe( + response => { + this.eventsList = response; + this.eventsList.forEach(element => { + this.eventSource.push({ + title: element.Subject, + startTime: new Date(element.StartDate), + endTime: new Date(element.EndDate), + allDay: false, + event: element + }); + this.loading(); }); - this.loading(); - }); - } - ); + } + ); + break; + + case "Pessoal": + //Inicializa o array eventSource + this.eventSource=[]; + this.eventService.getEvents(this.segment, formatDate(startTime, 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(endTime, 'yyyy-MM-dd HH:mm:ss', 'pt')).subscribe( + response => { + this.eventsListPessoal = response; + this.eventsListPessoal.forEach(element => { + this.eventSource.push({ + title: element.Subject, + startTime: new Date(element.StartDate), + endTime: new Date(element.EndDate), + allDay: false, + event: element + }); + this.loading(); + }); + } + ); + break; + + case "Oficial": + //Inicializa o array eventSource + this.eventSource=[]; + this.eventService.getEvents(this.segment, formatDate(startTime, 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(endTime, 'yyyy-MM-dd HH:mm:ss', 'pt')).subscribe( + response => { + this.eventsListOficial = response; + this.eventsListOficial.forEach(element => { + this.eventSource.push({ + title: element.Subject, + startTime: new Date(element.StartDate), + endTime: new Date(element.EndDate), + allDay: false, + event: element + }); + this.loading(); + }); + } + ); + break; + } + this.showLoader = false; } + RefreshEvents(ev: { startTime: Date, endTime: Date }){ + this.loadRangeEvents(ev.startTime, ev.endTime); + } + loading(){ this.myCal.loadEvents(); - } + } - refreshAgenda(event){ + doRefresh(ev){ this.loading(); setTimeout(() => { - event.target.complete(); + ev.target.complete(); }, 2000); } 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 d534dc437..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,7 +1,7 @@ - + Visualizar Evento 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 58863febf..e51814f32 100644 --- a/src/app/pages/events/event-detail/event-detail.page.ts +++ b/src/app/pages/events/event-detail/event-detail.page.ts @@ -31,7 +31,6 @@ export class EventDetailPage implements OnInit { } const eventId = paramMap.get('eventId'); - console.log(eventId); /* Load my event detail */ /* this.loadedEvent = this.eventsService.getEvent(eventId); */ this.eventItem = this.eventsService.getEvent(eventId); diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index d5fddb0db..0c55cbc22 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -30,7 +30,7 @@ pullingIcon="chevron-down-circle-outline" pullingText="deslize para actualizar" refreshingSpinner="circles" - refreshingText="a actualizar..."> + refreshingText="A actualizar..."> @@ -60,7 +60,7 @@
-
+

{{event.Subject}}

{{event.StartDate}} - {{event.EndDate}}

@@ -93,7 +93,7 @@
-
+

{{event.Subject}}

{{event.StartDate}} - {{event.EndDate}}

@@ -126,7 +126,7 @@
-
+

{{event.Subject}}

{{event.StartDate}} - {{event.EndDate}}

diff --git a/src/app/pages/events/events.page.scss b/src/app/pages/events/events.page.scss index ff069312c..0981a2ba5 100644 --- a/src/app/pages/events/events.page.scss +++ b/src/app/pages/events/events.page.scss @@ -75,16 +75,16 @@ margin: 0 auto; } - .div-content-oficial{ + .div-content-Oficial{ width: 85%; float: left; - border-left: 3px solid #cab0dc; + border-left: 4px solid #cab0dc; padding: 0 0 0 12px; } - .div-content-pessoal{ + .div-content-Pessoal{ width: 85%; float: left; - border-left: 3px solid #cbeecb; + border-left: 4px solid #cbeecb; padding: 0 0 0 12px; } .div-content-oficial h3, .div-content-pessoal h3{ diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index 8b7065929..cde1de028 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -4,6 +4,7 @@ import { AuthService } from 'src/app/services/auth.service'; import { User } from 'src/app/models/user.model'; import { ToastService } from 'src/app/services/toast.service'; import { environment } from 'src/environments/environment'; +import { AlertController } from '@ionic/angular'; @Component({ @@ -21,7 +22,8 @@ export class LoginPage implements OnInit { constructor( private router: Router, private authService: AuthService, - private toastService: ToastService) { } + private toastService: ToastService, + public alertController: AlertController) { } ngOnInit() { @@ -41,6 +43,17 @@ export class LoginPage implements OnInit { ); } + async presentAlert(message:string) { + const alert = await this.alertController.create({ + cssClass: 'my-custom-class', + header: 'Mensagem do sistema', + message: message, + buttons: ['OK'] + }); + + await alert.present(); + } + async Login(){ //Go to our home in home/feed. if(this.validateInput()){ @@ -50,11 +63,13 @@ export class LoginPage implements OnInit { } else { - this.toastService.presentToast('Não foi possível fazer login"'); + /* this.toastService.presentToast('Não foi possível fazer login"'); */ + this.presentAlert('O nome de utilizador e palavra-passe estão incorretas ou verifique a sua conexão com a internet e volte a tentar.'); } } else{ - this.toastService.presentToast('Preencha todos campos'); + /* this.toastService.presentToast('Preencha todos campos'); */ + this.presentAlert('Por favor, insira o seu nome de utilizador e palavra-passe.'); } } } diff --git a/src/environments/environment.ts b/src/environments/environment.ts index b04655be5..1c120b111 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/v1/api/', domain: 'gabinetedigital.local', - defaultuser: 'paulo.pinto', + defaultuser: 'tiago.kayaya', defaultuserpwd: 'tabteste@006' };