diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 90a3a84e3..e67e9bf0c 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -285,6 +285,7 @@ export class AgendaPage implements OnInit { /* console.log('Event clicked', event); */ //clear + this.setIntervenient([]); this.setIntervenientCC([]); this.clearPostEvent(); @@ -603,7 +604,7 @@ export class AgendaPage implements OnInit { let counter = 0; - // view MDGPR calendar with MDGPR profile + // view MDGPR calendar with MDGPR profile if (this.loggeduser.Profile == 'MDGPR') { this.eventService.getAllMdEvents(momentG(new Date(startTime), 'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime), 'yyyy-MM-dd 23:59:59')).then((response: any) => { diff --git a/src/app/pages/agenda/edit-event/edit-event.module.ts b/src/app/pages/agenda/edit-event/edit-event.module.ts index c1162fa5a..fbfb26ba7 100644 --- a/src/app/pages/agenda/edit-event/edit-event.module.ts +++ b/src/app/pages/agenda/edit-event/edit-event.module.ts @@ -8,6 +8,21 @@ import { EditEventPageRoutingModule } from './edit-event-routing.module'; import { EditEventPage } from './edit-event.page'; import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatInputModule } from '@angular/material/input'; + +import { MatNativeDateModule } from '@angular/material/core'; + +import { + NgxMatDatetimePickerModule, + NgxMatNativeDateModule, + NgxMatTimepickerModule +} from '@angular-material-components/datetime-picker'; + +import { ReactiveFormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; +import { MatSelectModule } from '@angular/material/select'; +import { NgxMatMomentModule } from '@angular-material-components/moment-adapter'; @NgModule({ imports: [ @@ -15,7 +30,16 @@ import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/att FormsModule, IonicModule, EditEventPageRoutingModule, - + MatDatepickerModule, + MatInputModule, + MatNativeDateModule, + NgxMatDatetimePickerModule, + NgxMatTimepickerModule, + NgxMatNativeDateModule, + NgxMatMomentModule, + MatSelectModule, + MatButtonModule, + ReactiveFormsModule, // AttendeeModalPageModule ], diff --git a/src/app/pages/agenda/edit-event/edit-event.page.html b/src/app/pages/agenda/edit-event/edit-event.page.html index 716a65858..721920f25 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.html +++ b/src/app/pages/agenda/edit-event/edit-event.page.html @@ -55,19 +55,23 @@
-
+
-
- - Oficial - Pessoal - +
+ + + + + Oficial + + + Pessoal + + + +
@@ -82,21 +86,30 @@
-
+
-
- - Reunião - Viagem - Conferência - Encontro - +
+ + + + + + Reunião + + + Viagem + + + Conferência + + + Encontro + + + +
@@ -115,77 +128,103 @@
-
- - - +
+ + + + + + + +
-
+
-
- - - +
+ + + + + + + +
-
-
+
+
-
- - {{recurring.Description}} - +
+ + + + {{recurring.Description}} + + + +
-
+
-
- - - +
+ + + + + + + +
diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/pages/agenda/edit-event/edit-event.page.ts index 368bdc781..18db101f0 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -11,20 +11,33 @@ import { ToastService } from 'src/app/services/toast.service'; import { Event } from '../../../models/event.model'; import { AttendeesPageModal } from '../../events/attendees/attendees.page'; import { SearchPage } from '../../search/search.page'; -import { ThemeService } from 'src/app/services/theme.service' - +import { ThemeService } from 'src/app/services/theme.service'; +import { NgxMatDateFormats } from '@angular-material-components/datetime-picker'; +import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker'; +const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { + parse: { + dateInput: "YYYY-MMMM-DD HH:mm" + }, + display: { + dateInput: "DD MMM YYYY H:mm", + monthYearLabel: "MMM YYYY", + dateA11yLabel: "LL", + monthYearA11yLabel: "MMMM YYYY" + } +} @Component({ selector: 'app-edit-event', templateUrl: './edit-event.page.html', styleUrls: ['./edit-event.page.scss'], + providers: [ + { provide: NGX_MAT_DATE_FORMATS, useValue: CUSTOM_DATE_FORMATS }, + ] }) export class EditEventPage implements OnInit { Form: FormGroup; validateFrom = false - public endMinDate = new Date(new Date().getTime() + 15 * 60000); - public minDate = new Date().toISOString().slice(0,10) postEvent: Event; isRecurring:string; @@ -41,6 +54,19 @@ export class EditEventPage implements OnInit { recurringTypes: any; selectedRecurringType: any; + public date: any; + public disabled = false; + public showSpinners = true; + public showSeconds = false; + public touchUi = false; + public enableMeridian = false; + public minDate = new Date().toISOString().slice(0,10) + public endMinDate = new Date(new Date().getTime() + 15 * 60000).toISOString().slice(0,10) + public maxDate: any; + public stepHour = 1; + public stepMinute = 5; + public stepSecond = 5; + loadedEventAttachments: Attachment[] = []; taskParticipants: any = []; taskParticipantsCc: any = []; @@ -48,6 +74,11 @@ export class EditEventPage implements OnInit { showAttendees = false; + public listColors = ['primary', 'accent', 'warn']; + public stepHours = [1, 2, 3, 4, 5]; + public stepMinutes = [1, 5, 10, 15, 20, 25]; + public stepSeconds = [1, 5, 10, 15, 20, 25]; + constructor( private modalController: ModalController, private navParams: NavParams, @@ -59,10 +90,12 @@ export class EditEventPage implements OnInit { public ThemeService: ThemeService ) { - this.postEvent = new Event(); + /* this.postEvent = new Event(); */ this.isEventEdited = false; - this.postEvent.EventRecurrence = { Type:'-1', LastOccurrence:''}; + /* this.postEvent.EventRecurrence = { Type:'-1', LastOccurrence:''}; */ this.postEvent = this.navParams.get('event'); + console.log(this.postEvent); + this.caller = this.navParams.get('caller'); this.initCalendarName = this.postEvent.CalendarName; @@ -99,6 +132,7 @@ export class EditEventPage implements OnInit { } ngOnInit() { + window.onresize = (event) => { // if not mobile remove all component if( window.innerWidth >= 1024) { @@ -178,6 +212,28 @@ export class EditEventPage implements OnInit { }) } + openInicio() { + let input: any = document.querySelector('#new-inicio') + if(input) { + console.log(input) + input.click() + } + } + + openFim() { + let input: any = document.querySelector('#new-fim') + if(input) { + input.click() + } + } + + openLastOccurrence() { + let input: any = document.querySelector('#last-occurrence') + if(input) { + input.click() + } + } + save() { @@ -207,7 +263,7 @@ export class EditEventPage implements OnInit { finally { this.goBack(); } - + } this.toastService.successMessage(); diff --git a/src/app/pages/agenda/new-event/new-event.module.ts b/src/app/pages/agenda/new-event/new-event.module.ts index ef2b17b44..76e2100d3 100644 --- a/src/app/pages/agenda/new-event/new-event.module.ts +++ b/src/app/pages/agenda/new-event/new-event.module.ts @@ -33,18 +33,11 @@ import { NgxMatMomentModule } from '@angular-material-components/moment-adapter' MatDatepickerModule, MatInputModule, MatNativeDateModule, - // NgxMatDatetimePickerModule, NgxMatTimepickerModule, NgxMatNativeDateModule, - // - NgxMatMomentModule, - // BrowserAnimationsModule, - // MatRadioModule, MatSelectModule, - //MatRadioModule, - //MatCheckboxModule, MatButtonModule, ReactiveFormsModule ],