diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html index d8b564e81..ca6e19283 100644 --- a/src/app/modals/create-process/create-process.page.html +++ b/src/app/modals/create-process/create-process.page.html @@ -29,19 +29,26 @@
- + 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) - - - Normal - Urgente - Muito Urgente - Urgentíssimo + + + 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) 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 7f978618c..a6cee6e16 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.html +++ b/src/app/pages/agenda/edit-event/edit-event.page.html @@ -237,19 +237,21 @@
- + -

+

{{document.SourceName}} - Correspondencia - AccoesPresidenciais - ArquivoDespachoElect - -

-

{{document.Stakeholders}} {{document.CreateDate | date: 'dd-MM-yy'}}

+

+

{{document.Stakeholders}}

+

+ Correspondência + Acções Presidenciais + Arquivo Despacho Electrónico + + {{document.CreateDate | date: 'dd-MM-yy'}}

diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html index fbff5023d..10cd89e2d 100644 --- a/src/app/pages/agenda/view-event/view-event.page.html +++ b/src/app/pages/agenda/view-event/view-event.page.html @@ -64,7 +64,7 @@
Documentos Anexados
- +

{{attach.SourceName}} 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 4db2c5d6b..2c071472b 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 @@ -65,8 +65,8 @@ 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) Muito Urgente (1 dia para a execução da tarefa) diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts index c917fd3ff..40972b507 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -193,7 +193,6 @@ export class EditEventPage implements OnInit { this.runValidation() if(this.Form.invalid) { - alert('error') return false } @@ -202,7 +201,7 @@ export class EditEventPage implements OnInit { this.showLoader = true await this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => { - if(this.initCalendarName != this.postEvent.CalendarName){ + if(this.initCalendarName != this.postEvent.CalendarName) { let body = { "EventId": this.postEvent.EventId, "CalendarDestinationName": this.postEvent.CalendarName, @@ -258,7 +257,6 @@ export class EditEventPage implements OnInit { this.dateControlStart = new FormControl(moment(this.postEvent.StartDate)); this.dateControlEnd = new FormControl(moment(this.postEvent.EndDate)); } - } saveTemporaryData() { diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts index 53c562db9..fd58bd2bb 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts @@ -163,6 +163,7 @@ export class OptsExpedientePage implements OnInit { } async distartExpedientModal(body:any){ + this.close(); const modal = await this.modalController.create({ component: DiscartExpedientModalPage, componentProps: { diff --git a/src/app/shared/publication/edit-action/edit-action.module.ts b/src/app/shared/publication/edit-action/edit-action.module.ts index 87961f035..085695a63 100644 --- a/src/app/shared/publication/edit-action/edit-action.module.ts +++ b/src/app/shared/publication/edit-action/edit-action.module.ts @@ -8,12 +8,41 @@ import { EditActionPageRoutingModule } from './edit-action-routing.module'; import { EditActionPage } from './edit-action.page'; + +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'; +import { MAT_DATE_LOCALE } from '@angular/material/core'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatInputModule } from '@angular/material/input'; +import { MatDialogModule } from '@angular/material/dialog'; +import { MatMenuModule } from '@angular/material/menu'; + @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, - EditActionPageRoutingModule + EditActionPageRoutingModule, + // Angular material + MatDatepickerModule, + MatInputModule, + MatNativeDateModule, + NgxMatDatetimePickerModule, + NgxMatTimepickerModule, + NgxMatNativeDateModule, + NgxMatMomentModule, + MatSelectModule, + MatButtonModule, + ReactiveFormsModule, + MatDialogModule, ], exports: [EditActionPage], declarations: [EditActionPage] diff --git a/src/app/shared/publication/edit-action/edit-action.page.html b/src/app/shared/publication/edit-action/edit-action.page.html index ecf256aaa..747d001a2 100644 --- a/src/app/shared/publication/edit-action/edit-action.page.html +++ b/src/app/shared/publication/edit-action/edit-action.page.html @@ -1,7 +1,7 @@

- Editar acção presidencial + 123 Editar acção presidencial