From 77753d042c339c765940492b22d87619e30a1aa3 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 9 Apr 2021 08:32:09 +0100 Subject: [PATCH 1/9] save --- .../document-detail/document-detail.page.html | 8 ++++---- src/app/pages/events/events.page.html | 14 +++++++------- .../expediente-detail/expediente-detail.page.html | 12 +++++------- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src/app/modals/document-detail/document-detail.page.html b/src/app/modals/document-detail/document-detail.page.html index 3f6dce71d..57c6aed55 100644 --- a/src/app/modals/document-detail/document-detail.page.html +++ b/src/app/modals/document-detail/document-detail.page.html @@ -38,8 +38,8 @@ -
-
+
+
@@ -89,7 +89,7 @@
-
+
@@ -105,7 +105,7 @@
-
+ - - +
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 f3640212c..7b919a41f 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 @@ -44,7 +44,7 @@ Descartar - + @@ -56,7 +56,7 @@
-
+
@@ -154,11 +154,9 @@ - -
- - - + + +
From 22320164b1328700c9b146351dc3e4ee2063eb2d Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 9 Apr 2021 08:34:20 +0100 Subject: [PATCH 2/9] save --- src/app/pages/agenda/view-event/view-event.page.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 744df111f..8980a1bc8 100644 --- a/src/app/pages/agenda/view-event/view-event.page.html +++ b/src/app/pages/agenda/view-event/view-event.page.html @@ -23,7 +23,9 @@
- +
{{loadedEvent.Subject}} From 0b13a445f3a5a6574651a457438a4def5ea4fa45 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 9 Apr 2021 08:37:43 +0100 Subject: [PATCH 3/9] save --- .../expedient-task-modal/expedient-task-modal.page.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 fa0c5a096..1585f5692 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 @@ -116,7 +116,7 @@
-
+
Date: Fri, 9 Apr 2021 08:59:22 +0100 Subject: [PATCH 4/9] save --- src/app/pages/chat/chat.page.html | 8 ++++++-- src/app/pages/chat/chat.page.scss | 4 +++- src/app/pages/chat/messages/messages.page.html | 8 ++++++-- src/app/shared/chat/messages/messages.page.html | 12 +++++++++--- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index 427672943..9317caafb 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -17,8 +17,12 @@ Chat
- - + +
diff --git a/src/app/pages/chat/chat.page.scss b/src/app/pages/chat/chat.page.scss index 90dfdab01..98da33591 100644 --- a/src/app/pages/chat/chat.page.scss +++ b/src/app/pages/chat/chat.page.scss @@ -19,11 +19,13 @@ ion-content{ font-size: 25px; } .div-icon{ - width: 60%; + display: flex; + width: 50%; float: right; font-size: 35px; overflow: auto; padding: 1px; + justify-content: flex-end; } .div-icon ion-icon{ float: right; diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html index 87175f7e1..33fb59b72 100644 --- a/src/app/pages/chat/messages/messages.page.html +++ b/src/app/pages/chat/messages/messages.page.html @@ -71,7 +71,9 @@
- +
@@ -80,7 +82,9 @@
- +
\ No newline at end of file diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html index 9ac6880fb..ca4efdb83 100644 --- a/src/app/shared/chat/messages/messages.page.html +++ b/src/app/shared/chat/messages/messages.page.html @@ -7,7 +7,9 @@
- +
- +
@@ -77,7 +79,10 @@
- + +
@@ -86,7 +91,9 @@
- +
diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html index 789262d29..58a589073 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.html +++ b/src/app/shared/chat/group-messages/group-messages.page.html @@ -6,7 +6,9 @@ {{room.name.split('-').join(' ')}}
- +
@@ -55,7 +57,9 @@
- +
@@ -64,7 +68,9 @@
- +
From f9745298d31c022b7a36440dd18f65a6e2e6ed43 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 9 Apr 2021 09:16:04 +0100 Subject: [PATCH 6/9] comment message unnecessary --- .../event-list/approve-event-modal/approve-event-modal.page.ts | 2 +- .../event-list/approve-event/approve-event.page.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts index d88b2a1ef..4a7d05a0f 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts @@ -148,7 +148,7 @@ export class ApproveEventModalPage implements OnInit { this.alertService.presentAlert('Operação realizada com sucesso!'); } else{ - this.alertService.presentAlert('Operação cancelada!'); + //this.alertService.presentAlert('Operação cancelada!'); } }); } 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 f5ee17a0b..41bdde68a 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 @@ -143,7 +143,7 @@ export class ApproveEventPage implements OnInit { this.alertService.presentAlert('Operação realizada com sucesso!'); } else { - this.alertService.presentAlert('Operação cancelada!'); + //this.alertService.presentAlert('Operação cancelada!'); } }); } From 824a953e8ccd63e260735ada737abf279017d8fa Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 9 Apr 2021 09:16:14 +0100 Subject: [PATCH 7/9] save --- .../agenda/approve-event-modal/approve-event-modal.page.ts | 2 +- .../shared/agenda/approve-event/approve-event.component.ts | 2 +- src/app/shared/popover/chat-popover/chat-popover.page.html | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts index 0ed22b7f7..89bfe9f74 100644 --- a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts +++ b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts @@ -135,7 +135,7 @@ export class ApproveEventModalPage implements OnInit { this.alertService.presentAlert('Operação realizada com sucesso!'); } else{ - this.alertService.presentAlert('Operação cancelada!'); + //this.alertService.presentAlert('Operação cancelada!'); } }); } diff --git a/src/app/shared/agenda/approve-event/approve-event.component.ts b/src/app/shared/agenda/approve-event/approve-event.component.ts index 3c2eb46e0..e94152a2b 100644 --- a/src/app/shared/agenda/approve-event/approve-event.component.ts +++ b/src/app/shared/agenda/approve-event/approve-event.component.ts @@ -152,7 +152,7 @@ export class ApproveEventComponent implements OnInit { this.goToEventsToApprove(); } else{ - this.alertService.presentAlert('Operação cancelada!'); + //this.alertService.presentAlert('Operação cancelada!'); } }); } diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.html b/src/app/shared/popover/chat-popover/chat-popover.page.html index 8e3e94859..c16ada8e6 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.page.html +++ b/src/app/shared/popover/chat-popover/chat-popover.page.html @@ -1,6 +1,8 @@
- +
From f56347149321ac80980430ccd7fcdeabdc0ab58f Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 9 Apr 2021 09:31:01 +0100 Subject: [PATCH 8/9] save --- src/app/pages/chat/chat.page.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index 9317caafb..a53954fc4 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -23,6 +23,9 @@ +
From 34a2d48a828e11dd88800acfab92038a093ef58e Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 9 Apr 2021 09:40:32 +0100 Subject: [PATCH 9/9] save --- src/app/pages/chat/messages/contacts/contacts.page.html | 4 +++- src/app/pages/chat/new-group/contacts/contacts.page.html | 4 +++- src/app/shared/chat/new-group/contacts/contacts.page.html | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/app/pages/chat/messages/contacts/contacts.page.html b/src/app/pages/chat/messages/contacts/contacts.page.html index b2f8e9705..4ae40f586 100644 --- a/src/app/pages/chat/messages/contacts/contacts.page.html +++ b/src/app/pages/chat/messages/contacts/contacts.page.html @@ -3,7 +3,9 @@
- +
Nova Conversa diff --git a/src/app/pages/chat/new-group/contacts/contacts.page.html b/src/app/pages/chat/new-group/contacts/contacts.page.html index 5120198ad..441bdddae 100644 --- a/src/app/pages/chat/new-group/contacts/contacts.page.html +++ b/src/app/pages/chat/new-group/contacts/contacts.page.html @@ -3,7 +3,9 @@
- +
Contactos diff --git a/src/app/shared/chat/new-group/contacts/contacts.page.html b/src/app/shared/chat/new-group/contacts/contacts.page.html index 5120198ad..441bdddae 100644 --- a/src/app/shared/chat/new-group/contacts/contacts.page.html +++ b/src/app/shared/chat/new-group/contacts/contacts.page.html @@ -3,7 +3,9 @@
- +
Contactos