diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html index 71b55eb62..633c1d421 100644 --- a/src/app/modals/create-process/create-process.page.html +++ b/src/app/modals/create-process/create-process.page.html @@ -22,14 +22,14 @@
-
+
TT
- Urgente (2 dias para a execução da tarefa) Muito Urgente (1 dia para a execução da tarefa) Urgentíssimo (8 horas para a execução da tarefa) - + --> - + Normal (4 dias para a execução da tarefa) Urgente (2 dias para a execução da tarefa) diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index f497e0ead..8cfcd1062 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -121,13 +121,15 @@ 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 a9818ea24..76e2100d3 100644 --- a/src/app/pages/agenda/new-event/new-event.module.ts +++ b/src/app/pages/agenda/new-event/new-event.module.ts @@ -7,6 +7,22 @@ import { IonicModule } from '@ionic/angular'; import { NewEventPageRoutingModule } from './new-event-routing.module'; import { NewEventPage } from './new-event.page'; +import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; +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: [ @@ -14,6 +30,16 @@ import { NewEventPage } from './new-event.page'; FormsModule, IonicModule, NewEventPageRoutingModule, + MatDatepickerModule, + MatInputModule, + MatNativeDateModule, + NgxMatDatetimePickerModule, + NgxMatTimepickerModule, + NgxMatNativeDateModule, + NgxMatMomentModule, + MatSelectModule, + MatButtonModule, + ReactiveFormsModule ], declarations: [NewEventPage] }) diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html index 494eb4a21..efb0cdbe5 100644 --- a/src/app/pages/agenda/new-event/new-event.page.html +++ b/src/app/pages/agenda/new-event/new-event.page.html @@ -18,39 +18,30 @@
- -
-
+
-
- - Calendário do Presidente da República - Meu calendário - +
+ + + + + + Calendário do Presidente da República + + + Meu calendário + + + + +
- - - -
@@ -60,38 +51,26 @@
- - -
- -
-
+
-
- - Oficial - Pessoal - +
+ + + + + Oficial + + + Pessoal + + + +
@@ -105,20 +84,30 @@
-->
-
+
-
- - Reunião - Viagem - Conferência - Encontro - +
+ + + + + + Reunião + + + Viagem + + + Conferência + + + Encontro + + + +
@@ -133,78 +122,110 @@
-->
-
+
-
- - - + +
+ + + + + + + +
-
+
-
- +
+ + + + + + + - > - -
-
+
-
- - {{recurring.Description}} - +
+ + + + + {{recurring.Description}} + + + +
-
-
+
+
-
- - - +
+ + + + + + +
@@ -218,15 +239,9 @@
- Adicionar intervenientes* -
- - - {{participant.Name}} - - -
- + Adicionar intervenientes* + {{participant.Name}} +
@@ -246,15 +261,9 @@
- Com conhecimento -
- - - {{participant.Name}} - - -
- + Com conhecimento + {{participant.Name}} +
diff --git a/src/app/pages/agenda/new-event/new-event.page.scss b/src/app/pages/agenda/new-event/new-event.page.scss index 905df261e..2cd5492f2 100644 --- a/src/app/pages/agenda/new-event/new-event.page.scss +++ b/src/app/pages/agenda/new-event/new-event.page.scss @@ -16,7 +16,7 @@ ion-content{ padding: 30px 20px 0px 20px; color:#000; transform: translate3d(0, 1px, 0); - + .title-content{ margin: 0px auto; overflow: auto; @@ -59,7 +59,7 @@ ion-content{ } .container-div{ margin-bottom: 15px; - overflow: auto; + //overflow: auto; } .ion-item-class-2{ display: flex; @@ -91,9 +91,9 @@ ion-content{ flex: 1; } .list-people{ - width: 256px; + width: 250px; float: left; - + } .add-people{ width: 45px; @@ -154,7 +154,7 @@ ion-content{ --color:#ffffff; margin:10px; } - + .text-input{ width: 100%; border: 1px solid #ebebeb; @@ -162,7 +162,7 @@ ion-content{ padding: 0 !important; border-radius: 5px; } - + /* Error Messages */ .error{ color:red; @@ -178,7 +178,7 @@ ion-content{ - + .app-name{ background: var(--title-text-color); border-radius: 18px; @@ -195,8 +195,8 @@ ion-content{ -ms-border-radius: 18px; -o-border-radius: 18px; } - - + + .close-button { display: none; height: 20px; @@ -215,4 +215,4 @@ ion-content{ } .icon-time{ color: #797979b0; -} \ No newline at end of file +} diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts index e12eb9365..dd6468e00 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -15,13 +15,28 @@ import { SearchPage } from '../../search/search.page'; import { ThemePalette } from '@angular/material/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { EventRecurrence } from 'src/app/models/agenda/eventrecurrence.model'; -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-new-event', templateUrl: './new-event.page.html', styleUrls: ['./new-event.page.scss'], + providers: [ + { provide: NGX_MAT_DATE_FORMATS, useValue: CUSTOM_DATE_FORMATS }, + ] }) export class NewEventPage implements OnInit { @@ -61,6 +76,14 @@ export class NewEventPage implements OnInit { members:any; CalendarName; + 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]; + + autoStartTime; + autoEndTime; + constructor( private modalController: ModalController, private navParams: NavParams, @@ -82,8 +105,21 @@ export class NewEventPage implements OnInit { this.selectedDate = this.navParams.get('eventSelectedDate'); this.taskParticipants = this.navParams.get('attendees'); - this.postEvent.StartDate = new Date() - this.postEvent.EndDate = (new Date(new Date().getTime() + 15 * 60000)) + let now = new Date(); + + if(now.getMinutes() <= 30){ + this.autoStartTime = new Date(now.setMinutes(30)); + this.postEvent.StartDate = this.autoStartTime; + this.autoEndTime = new Date(this.autoStartTime.getTime() + 30 * 60000); + this.postEvent.EndDate = this.autoEndTime; + } + else{ + this.autoStartTime = new Date(now.setHours(now.getHours()+1)); + this.autoStartTime = new Date(this.autoStartTime.setMinutes(0)); + this.postEvent.StartDate = this.autoStartTime; + this.autoEndTime = new Date(this.autoStartTime.getTime() + 30 * 60000); + this.postEvent.EndDate = this.autoEndTime; + } } ngOnInit() { @@ -91,16 +127,11 @@ export class NewEventPage implements OnInit { this.CalendarName = this.loggeduser.Profile; this.selectedRecurringType = "-1"; console.log(this.postEvent); + console.log(this.selectedSegment); + this.getRecurrenceTypes(); - /* console.log(this.profile); */ - - let selectedStartdDate = this.selectedDate; - let selectedEndDate = new Date(this.selectedDate); - /* Set + 30minutes to seleted datetime */ - selectedEndDate.setMinutes(this.selectedDate.getMinutes() + 30) ; - if(this.selectedSegment != "Combinada"){ this.postEvent ={ EventId: '', @@ -108,9 +139,9 @@ export class NewEventPage implements OnInit { Body: this.eventBody, Location: '', CalendarId: '', - CalendarName: '', - StartDate: selectedStartdDate, - EndDate: new Date(selectedEndDate), + CalendarName: 'Oficial', + StartDate: this.autoStartTime, + EndDate: this.autoEndTime, EventType: 'Reunião', Attendees: null, IsMeeting: false, @@ -120,7 +151,7 @@ export class NewEventPage implements OnInit { Organizer: '', Category: 'Reunião', HasAttachments: false, - EventRecurrence: {Type:'-1'}, + EventRecurrence: {Type:'-1',LastOccurrence:this.autoEndTime}, }; } else{ @@ -131,8 +162,8 @@ export class NewEventPage implements OnInit { Location: '', CalendarId: '', CalendarName: 'Oficial', - StartDate: selectedStartdDate, - EndDate: new Date(selectedEndDate), + StartDate: this.autoStartTime, + EndDate: this.autoEndTime, EventType: 'Reunião', Attendees: null, IsMeeting: false, @@ -142,7 +173,7 @@ export class NewEventPage implements OnInit { Organizer: '', Category: 'Reunião', HasAttachments: false, - EventRecurrence: {Type:'-1'}, + EventRecurrence: {Type:'-1',LastOccurrence:this.autoEndTime}, }; } @@ -224,6 +255,28 @@ export class NewEventPage 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() + } + } + async save() { this.injectValidation() this.runValidation() diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html index f53904935..da328786f 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html +++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html @@ -59,7 +59,7 @@ Semanal Mensal Anual - Nunca + Nunca

diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html index 43177e2d1..ea58f3b8a 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html @@ -51,7 +51,7 @@
- Urgente (2 dias para a execução da tarefa) Muito Urgente (1 dia para a execução da tarefa) Urgentíssimo (8 horas para a execução da tarefa) - + --> - + Normal (4 dias para a execução da tarefa) Urgente (2 dias para a execução da tarefa) diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts index 9617957b1..612b59506 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -98,7 +98,9 @@ export class NewEventPage implements OnInit { @ViewChild('picker1') picker1: any; Form: FormGroup; - validateFrom = false + validateFrom = false; + autoStartTime; + autoEndTime; public options = [ { value: true, label: 'True' }, @@ -129,8 +131,22 @@ export class NewEventPage implements OnInit { this.loggeduser = userService.ValidatedUser; this.postEvent = new Event(); - this.postEvent.StartDate = new Date() - this.postEvent.EndDate = new Date(new Date().getTime() + 15 * 60000); + let now = new Date(); + + if(now.getMinutes() <= 30){ + this.autoStartTime = new Date(now.setMinutes(30)); + this.postEvent.StartDate = this.autoStartTime; + this.autoEndTime = new Date(this.autoStartTime.getTime() + 30 * 60000); + this.postEvent.EndDate = this.autoEndTime; + } + else{ + this.autoStartTime = new Date(now.setHours(now.getHours()+1)); + this.autoStartTime = new Date(this.autoStartTime.setMinutes(0)); + this.postEvent.StartDate = this.autoStartTime; + this.autoEndTime = new Date(this.autoStartTime.getTime() + 30 * 60000); + this.postEvent.EndDate = this.autoEndTime; + } + } ngOnInit() { @@ -143,14 +159,6 @@ export class NewEventPage implements OnInit { this.eventBody = { BodyType : "1", Text : ""}; this.postEvent.Body = this.eventBody; - /* console.log(this.profile); */ - - let selectedStartdDate = this.selectedDate; - let selectedEndDate = new Date(this.selectedDate); - /* Set + 30minutes to seleted datetime */ - selectedEndDate.setMinutes(this.selectedDate.getMinutes() + 30) ; - - if(this.selectedSegment != "Combinada"){ this.postEvent ={ EventId: '', @@ -159,8 +167,8 @@ export class NewEventPage implements OnInit { Location: '', CalendarId: '', CalendarName: 'Oficial', - StartDate: selectedStartdDate, - EndDate: new Date(selectedEndDate), + StartDate: this.autoStartTime, + EndDate: this.autoEndTime, EventType: 'Reunião', Attendees: null, IsMeeting: false, @@ -170,7 +178,7 @@ export class NewEventPage implements OnInit { Organizer: '', Category: 'Reunião', HasAttachments: false, - EventRecurrence: {Type:'-1'}, + EventRecurrence: {Type:'-1',LastOccurrence:this.autoEndTime}, }; } else{ @@ -181,8 +189,8 @@ export class NewEventPage implements OnInit { Location: '', CalendarId: '', CalendarName: 'Oficial', - StartDate: selectedStartdDate, - EndDate: new Date(selectedEndDate), + StartDate: this.autoStartTime, + EndDate: this.autoEndTime, EventType: 'Reunião', Attendees: null, IsMeeting: false, @@ -192,7 +200,7 @@ export class NewEventPage implements OnInit { Organizer: '', Category: 'Reunião', HasAttachments: false, - EventRecurrence: {Type:'-1'}, + EventRecurrence: {Type:'-1',LastOccurrence:this.autoEndTime}, }; } diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html index f08dabfa3..316960fae 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html @@ -41,7 +41,7 @@
- Oficial Pessoal - + --> - + Oficial @@ -75,7 +75,7 @@
- Viagem Conferência Encontro - + --> - + @@ -116,7 +116,7 @@
- - + --> + class="width-100 date-hour-picker">
- - + --> + class="width-100 date-hour-picker">
- {{recurring.Description}} - + -->
- - + --> - + + + + + + + diff --git a/src/assets/images/theme/gov/icons-received-event-selected.svg b/src/assets/images/theme/gov/icons-received-event-selected.svg new file mode 100644 index 000000000..6243f023f --- /dev/null +++ b/src/assets/images/theme/gov/icons-received-event-selected.svg @@ -0,0 +1,10 @@ + + + + + + + + + +