diff --git a/src/app/modals/add-note/add-note.page.html b/src/app/modals/add-note/add-note.page.html index 0a42824e7..52e76aa19 100644 --- a/src/app/modals/add-note/add-note.page.html +++ b/src/app/modals/add-note/add-note.page.html @@ -50,6 +50,6 @@
- +
diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html index 14ecffe29..3fb228478 100644 --- a/src/app/modals/create-process/create-process.page.html +++ b/src/app/modals/create-process/create-process.page.html @@ -188,6 +188,6 @@
- +
diff --git a/src/app/modals/dar-parecer/dar-parecer.page.html b/src/app/modals/dar-parecer/dar-parecer.page.html index 1d904b15d..e6a7af109 100644 --- a/src/app/modals/dar-parecer/dar-parecer.page.html +++ b/src/app/modals/dar-parecer/dar-parecer.page.html @@ -57,7 +57,7 @@
- +
diff --git a/src/app/modals/delegar/delegar.page.html b/src/app/modals/delegar/delegar.page.html index 36f32db59..8b6165111 100644 --- a/src/app/modals/delegar/delegar.page.html +++ b/src/app/modals/delegar/delegar.page.html @@ -93,7 +93,7 @@
- +
diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html index 324cf958c..fa2cfd448 100644 --- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html +++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html @@ -352,7 +352,7 @@
- +
diff --git a/src/app/modals/forward/forward.page.html b/src/app/modals/forward/forward.page.html index 6af700d74..d74075d2d 100644 --- a/src/app/modals/forward/forward.page.html +++ b/src/app/modals/forward/forward.page.html @@ -18,7 +18,7 @@
- Adicionar intervenientes + Adicionar intervenientes* {{participant.Name}} @@ -78,7 +78,7 @@
- +
diff --git a/src/app/modals/profile/edit-profile/edit-profile.page.html b/src/app/modals/profile/edit-profile/edit-profile.page.html index 534aee8d9..c5e2211e9 100644 --- a/src/app/modals/profile/edit-profile/edit-profile.page.html +++ b/src/app/modals/profile/edit-profile/edit-profile.page.html @@ -139,7 +139,7 @@
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 7f2baa253..694390ffe 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.html +++ b/src/app/pages/agenda/edit-event/edit-event.page.html @@ -240,7 +240,7 @@
- Adicionar intervenientes + Adicionar intervenientes* {{participant.Name}} @@ -263,7 +263,7 @@
- Adicionar intervenientes + Adicionar intervenientes* {{participant.Name}} @@ -350,6 +350,6 @@
- +
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 483d67e23..fe77ab78d 100644 --- a/src/app/pages/agenda/new-event/new-event.page.html +++ b/src/app/pages/agenda/new-event/new-event.page.html @@ -324,7 +324,7 @@ 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 606a601f1..873b76a7f 100644 --- a/src/app/pages/agenda/new-event/new-event.page.scss +++ b/src/app/pages/agenda/new-event/new-event.page.scss @@ -88,7 +88,7 @@ ion-content{ .ion-input-class-no-height{ border: 1px solid #ebebeb; border-radius: 5px; - flex: 1; + height: 12px; } .list-people{ width: 250px; diff --git a/src/app/pages/events/attendees/attendees.page.html b/src/app/pages/events/attendees/attendees.page.html index 26156426e..d55c30178 100644 --- a/src/app/pages/events/attendees/attendees.page.html +++ b/src/app/pages/events/attendees/attendees.page.html @@ -90,7 +90,7 @@ diff --git a/src/app/pages/events/edit-event/edit-event.page.html b/src/app/pages/events/edit-event/edit-event.page.html index 50a9723c8..3a1d4630a 100644 --- a/src/app/pages/events/edit-event/edit-event.page.html +++ b/src/app/pages/events/edit-event/edit-event.page.html @@ -195,7 +195,7 @@
- +
diff --git a/src/app/pages/events/event-detail-modal/event-detail-modal.page.html b/src/app/pages/events/event-detail-modal/event-detail-modal.page.html index 565af41d2..93ad1a409 100644 --- a/src/app/pages/events/event-detail-modal/event-detail-modal.page.html +++ b/src/app/pages/events/event-detail-modal/event-detail-modal.page.html @@ -208,7 +208,7 @@
- Gravar + Enviar
diff --git a/src/app/pages/events/event-detail/event-detail.page.html b/src/app/pages/events/event-detail/event-detail.page.html index 15f9c7920..822a95922 100644 --- a/src/app/pages/events/event-detail/event-detail.page.html +++ b/src/app/pages/events/event-detail/event-detail.page.html @@ -208,7 +208,7 @@
- +
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts index 76b71e2bb..8d9c5fda8 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts @@ -214,16 +214,15 @@ export class ApproveEventPage implements OnInit { try { await this.processes.PostTaskAction(body).toPromise() - this.toastService._successMessage(); this.goBack(); - this.toastService._successMessage('Evento Aprovar') + this.toastService._successMessage('Evento aprovado') } catch (error) { if(error.status == 0) { this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') } else { - this.toastService._badRequest('Evento não aprovar') + this.toastService._badRequest('Evento não aprovado') } } finally { diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html index a02ff9b33..173ca0e50 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html @@ -314,7 +314,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 4a463baea..891d862d0 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 @@ -235,6 +235,6 @@
- +
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html index e9992d414..19516b2be 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html @@ -102,7 +102,7 @@ - +
@@ -113,7 +113,7 @@
- +
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html index 7a56633c5..bc027cf33 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html +++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html @@ -112,7 +112,7 @@
- + @@ -120,7 +120,7 @@
- +
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index cc3b7a57a..a6e2e9f6a 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -138,7 +138,7 @@
-
+
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss index e6118a619..b872824e5 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss @@ -677,4 +677,11 @@ ion-content{ .item-options-active{ display: none !important; } +} + +.center-box { + display: flex; + justify-content: center; + align-items: center; + flex-wrap: wrap; } \ No newline at end of file diff --git a/src/app/pages/publications/edit-action/edit-action.page.html b/src/app/pages/publications/edit-action/edit-action.page.html index ce5c80a40..3a622eade 100644 --- a/src/app/pages/publications/edit-action/edit-action.page.html +++ b/src/app/pages/publications/edit-action/edit-action.page.html @@ -115,7 +115,7 @@ diff --git a/src/app/pages/publications/new-publication/new-publication.page.html b/src/app/pages/publications/new-publication/new-publication.page.html index 5139de6e1..f5a680769 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.html +++ b/src/app/pages/publications/new-publication/new-publication.page.html @@ -102,7 +102,7 @@ diff --git a/src/app/services/events/attendees/attendees.page.html b/src/app/services/events/attendees/attendees.page.html index b40e32f74..9570c6f0d 100644 --- a/src/app/services/events/attendees/attendees.page.html +++ b/src/app/services/events/attendees/attendees.page.html @@ -85,7 +85,7 @@ diff --git a/src/app/services/events/edit-event/edit-event.page.html b/src/app/services/events/edit-event/edit-event.page.html index bd10a1073..d6ac380b6 100644 --- a/src/app/services/events/edit-event/edit-event.page.html +++ b/src/app/services/events/edit-event/edit-event.page.html @@ -195,7 +195,7 @@
- +
diff --git a/src/app/services/events/event-detail-modal/event-detail-modal.page.html b/src/app/services/events/event-detail-modal/event-detail-modal.page.html index 08b6cb64c..378e000fc 100644 --- a/src/app/services/events/event-detail-modal/event-detail-modal.page.html +++ b/src/app/services/events/event-detail-modal/event-detail-modal.page.html @@ -208,7 +208,7 @@
- Gravar + Enviar
diff --git a/src/app/services/events/event-detail/event-detail.page.html b/src/app/services/events/event-detail/event-detail.page.html index 5217cc183..dc23c3b6e 100644 --- a/src/app/services/events/event-detail/event-detail.page.html +++ b/src/app/services/events/event-detail/event-detail.page.html @@ -208,7 +208,7 @@
- +
diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html index bb16d8e5c..2976b4349 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html @@ -371,6 +371,6 @@
- +
diff --git a/src/app/shared/agenda/edit-event/edit-event.page.html b/src/app/shared/agenda/edit-event/edit-event.page.html index 3ea1ebd98..98d8fae17 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.html +++ b/src/app/shared/agenda/edit-event/edit-event.page.html @@ -226,7 +226,7 @@
-
Adicionar intervenientes
+
Adicionar intervenientes*
{{participant.Name}}
@@ -321,7 +321,7 @@ 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 81a806fc8..157d18e25 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -123,8 +123,6 @@ export class EditEventPage implements OnInit { this.initCalendarName = this.postEvent.CalendarName; - this.loadedEventAttachments = this.loadedEventAttachments.concat(this.postEvent.Attachments) - this.getRecurrenceTypes(); setTimeout(() => { @@ -136,7 +134,7 @@ export class EditEventPage implements OnInit { } ngOnChanges(changes: any): void { - this.loadedEventAttachments = this.loadedEventAttachments.concat(this.postEvent.Attachments) + this.loadedEventAttachments = this.postEvent.Attachments } close() { @@ -484,8 +482,8 @@ export class EditEventPage implements OnInit { } }); await modal.present(); - modal.onDidDismiss().then( async (res)=>{ - if(res){ + modal.onDidDismiss().then( async (res) => { + if(res) { const data = res.data; const ApplicationIdDocumentToSave: any = { @@ -495,7 +493,6 @@ export class EditEventPage implements OnInit { Stakeholders: data.selected.Stakeholders | data.selected.EntidadeOrganicaNome, ApplicationId: data.selected.ApplicationType.toString(), CreateDate: data.selected.Data, - // needed to attach this document Id: 'add', SourceTitle: data.selected.Assunto, Source: '1', @@ -503,7 +500,6 @@ export class EditEventPage implements OnInit { SerialNumber: '', } - this.loadedEventAttachments.push(ApplicationIdDocumentToSave) } diff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html index 2ff97f65a..9f02d1f86 100644 --- a/src/app/shared/agenda/new-event/new-event.page.html +++ b/src/app/shared/agenda/new-event/new-event.page.html @@ -341,7 +341,7 @@ diff --git a/src/app/shared/event/attendee-modal/attendee-modal.page.html b/src/app/shared/event/attendee-modal/attendee-modal.page.html index b81cf0951..f9e36e2ab 100644 --- a/src/app/shared/event/attendee-modal/attendee-modal.page.html +++ b/src/app/shared/event/attendee-modal/attendee-modal.page.html @@ -87,7 +87,7 @@ 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 cd22a5879..f16b3c42c 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 @@ -324,6 +324,6 @@
- +
diff --git a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.html b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.html index 34f938ca0..c31e8b565 100644 --- a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.html +++ b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.html @@ -12,14 +12,14 @@
- +
- +
diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.html b/src/app/shared/popover/opts-expediente/opts-expediente.page.html index 71c28949f..162041115 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.html +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.html @@ -19,7 +19,7 @@ - +
@@ -27,7 +27,7 @@