diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html index b3ce63c3f..40169c9a9 100644 --- a/src/app/modals/create-process/create-process.page.html +++ b/src/app/modals/create-process/create-process.page.html @@ -38,17 +38,17 @@ - - Reunião + + Normal - - Viagem + + Urgente - - Conferência + + Muito Urgente - - Encontro + + Urgentíssimo @@ -64,9 +64,11 @@
- Toppings - - {{topping}} + + Normal + Urgente + Muito Urgente + Urgentíssimo diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index 5e529eb78..878fc8ef1 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -90,7 +90,7 @@
- + 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 91cc3111e..6bea75699 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 @@ -42,21 +42,12 @@ Urgentíssimo (8 horas para a execução da tarefa) - - - - - Reunião - - - Viagem - - - Conferência - - - Encontro - + + + Normal (4 dias para a execução da tarefa) + 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) @@ -71,7 +62,6 @@
- Tipo de assunto - Toppings {{type.Description}} 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 9bac41b00..7c826ee4c 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -68,6 +68,8 @@ export class NewEventPage implements OnInit { public stepSecond = 5; public color: ThemePalette = 'primary'; + james: any + @Input() profile:string; @Input() selectedSegment: string; @Input() selectedDate: Date; 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 699f59c77..3b8b8d7f7 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 @@ -68,26 +68,6 @@
- -
@@ -173,7 +153,9 @@
- Não se repete Repete + + + + + Não se repete + + + Repete + + + +
@@ -257,8 +257,7 @@ - - +
@@ -272,9 +271,6 @@
- - - diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts index 9df6c755f..359f8dda9 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts @@ -12,11 +12,29 @@ import { EventsService } from 'src/app/services/events.service'; import { ProcessesService } from 'src/app/services/processes.service'; import { ToastService } from 'src/app/services/toast.service'; import { Event } from '../../../models/event.model'; +import { NgxMatDateFormats, 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 EditEventToApproveComponent implements OnInit {