diff --git a/package-lock.json b/package-lock.json index fa3e8341e..3c82bdf4f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5541,6 +5541,11 @@ "assert-plus": "^1.0.0" } }, + "date-fns": { + "version": "2.15.0", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.15.0.tgz", + "integrity": "sha512-ZCPzAMJZn3rNUvvQIMlXhDr4A+Ar07eLeGsGREoWU19a3Pqf5oYa+ccd+B3F6XVtQY6HANMFdOQ8A+ipFnvJdQ==" + }, "date-format": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/date-format/-/date-format-3.0.0.tgz", diff --git a/package.json b/package.json index a02dedd41..9940c0444 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,7 @@ "axios": "^0.19.2", "capacitor-datepicker": "0.0.2", "cordova-ios": "6.1.0", + "date-fns": "^2.15.0", "ionic2-calendar": "^0.6.6", "moment": "^2.27.0", "rxjs": "~6.5.1", diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index baa28bcd7..6618a6530 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -33,8 +33,8 @@ - + + + + Adicionar + + --> + diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 85a0445cc..a34e7affd 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -3,6 +3,10 @@ import { CalendarComponent } from 'ionic2-calendar'; 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 } from 'rxjs'; +import { Event } from '../../models/event.model'; +import { parse } from 'date-fns'; @Component({ selector: 'app-agenda', @@ -11,15 +15,15 @@ import { CalModalPage } from '../cal-modal/cal-modal.page'; }) export class AgendaPage implements OnInit { - /* event = { - title: '', - desc: '', - startTime: '', - endTime: '', + event = { + title: 'Teste', + desc: 'Desc', + startTime: '2020,21,08', + endTime: '2020,22,08', allDay: false }; - minDate = new Date().toDateString(); */ + /* minDate = new Date().toDateString(); */ /* List of events of our calendar */ eventSource = []; @@ -37,16 +41,19 @@ export class AgendaPage implements OnInit { @ViewChild(CalendarComponent) myCal: CalendarComponent; segment:string; + eventsList: Event[]; constructor( private alertCtrl: AlertController, @Inject(LOCALE_ID) private locale: string, - private modalCtrl: ModalController + private modalCtrl: ModalController, + private eventService: EventsService ) {} ngOnInit() { //Inicializar segment this.segment = "combinada"; + this.createdEvent(); /* this.resetEvent(); */ } @@ -190,4 +197,55 @@ export class AgendaPage implements OnInit { } }); } + + + + async createdEvent(){ + var s = '01-01-1970 00:03:44'; + var d = new Date(s); + console.log(d); + + const defaultStartDate = new Date(); + const test = parse('Fri Aug 21 2020 14:20:06 GMT+0100 (West Africa Standard Time)', 'd/M/yyyy HH:mm:ss', new Date()); + console.log(test); + const defaultEndDate = new Date(); + + await this.eventService.allEvents().subscribe( + response => { + this.eventsList = response; + + console.log(this.eventsList[0].EventId); + + for(let i=0; i