-
+
@@ -14,13 +14,13 @@
-
+
-
+
-
+
@@ -61,9 +61,9 @@
-
\ No newline at end of file
+
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 a5585de15..1ea220083 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.ts
+++ b/src/app/pages/agenda/edit-event/edit-event.page.ts
@@ -162,7 +162,7 @@ export class EditEventPage implements OnInit {
CalendarName: new FormControl(this.postEvent.CalendarName, [
Validators.required
]),
- Categories: new FormControl(this.postEvent.Categories[0], [
+ Categories: new FormControl(this.postEvent.Categories, [
Validators.required
]),
IsRecurring: new FormControl(this.postEvent.IsRecurring, [
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 c4cbb7eaf..c7197f152 100644
--- a/src/app/pages/agenda/new-event/new-event.page.html
+++ b/src/app/pages/agenda/new-event/new-event.page.html
@@ -13,7 +13,7 @@
-
+
@@ -43,7 +43,7 @@
-
+
-
+
@@ -64,9 +64,9 @@
Oficial
Pessoal
@@ -89,9 +89,9 @@
-
-
+
+
-
- {{document.Assunto}}
- {{document.appName}}
+
+ {{document.Assunto}}
+ {{document.appName}}
-
+
{{document.EntidadeOrganicaNome}} {{document.Data | date: 'dd-MM-yy'}}
-
+
@@ -302,4 +302,4 @@
-
\ 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 3658c257d..79a86ffc0 100644
--- a/src/app/pages/agenda/new-event/new-event.page.ts
+++ b/src/app/pages/agenda/new-event/new-event.page.ts
@@ -114,7 +114,7 @@ export class NewEventPage implements OnInit {
AppointmentState: 0,
TimeZone: '',
Organizer: '',
- Categories: ['Reunião'],
+ Categories: 'Reunião',
HasAttachments: false,
EventRecurrence: {Type:'-1'},
};
@@ -136,7 +136,7 @@ export class NewEventPage implements OnInit {
AppointmentState: 0,
TimeZone: '',
Organizer: '',
- Categories: ['Reunião'],
+ Categories: 'Reunião',
HasAttachments: false,
EventRecurrence: {Type:'-1'},
};
@@ -207,7 +207,7 @@ export class NewEventPage implements OnInit {
Date: new FormControl(this.dateValid, [
Validators.required
]),
- Categories: new FormControl(this.postEvent.Categories[0], [
+ Categories: new FormControl(this.postEvent.Categories, [
Validators.required
]),
participantes: new FormControl(this.taskParticipants, [
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 055a89fc5..3420657e9 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
@@ -293,7 +293,6 @@ export class ApproveEventPage implements OnInit {
modal.onDidDismiss().then(res => {
this.getTask();
- this.goBack();
});
}
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 be0d84f1c..551b901e2 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
@@ -8,7 +8,7 @@
-
Oficial
Pessoal
@@ -85,11 +85,11 @@
-
-
Reunião
Viagem
@@ -100,7 +100,7 @@
-
+
Reunião
@@ -116,7 +116,7 @@
-
+
@@ -127,10 +127,10 @@
-
-
+
-
-
@@ -166,30 +166,30 @@
-
-
+
-
-
@@ -204,15 +204,15 @@
-
Não se repete
Repete
@@ -224,9 +224,9 @@
@@ -307,21 +307,21 @@
Anexar Documentos
-
+