-
+
Gabinete Digital
-
+
@@ -27,6 +27,7 @@

Eventos para Aprovação

{{count_ev_md+count_ev_pr}} Documentos

+
@@ -34,6 +35,7 @@

Correspondencia

{{count_exp_dailywork}} Documentos

+
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss index fe9b1c2f2..4b314578b 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss @@ -87,6 +87,9 @@ ion-content{ margin: 0 auto; background:#ecf8ff; overflow:auto; + border: 1px solid red; + padding: 0 !important; + margin: 0 !important; border-top-left-radius: 25px; border-top-right-radius: 25px; @@ -114,16 +117,19 @@ ion-content{ overflow: auto; } .exp-card{ - width: 174px; + width: 173px; height: 200px; - margin: 8px; - padding: 30px 5px 30px 5px; + margin-right: 14px; + margin-bottom: 14px; + //margin: 8px; + //padding: 30px 5px 30px 5px; border-radius: 15px; box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07); //border: solid 1px #e9e9e9; /* --background-color: #ffffff !important; */ background-color: #ffffff !important; float: left; + border: 1px solid red; } .exp-card-icon{ margin: 0 auto; From a8a27ef168540dd96c9cb56249dcb0cdc2a9ab85 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Sun, 11 Apr 2021 16:44:18 +0100 Subject: [PATCH 2/6] save --- .../gabinete-digital.page.html | 2 +- .../gabinete-digital.page.scss | 100 ++++++++++-------- 2 files changed, 54 insertions(+), 48 deletions(-) diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 86cc72ff5..da5e3e16e 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -19,7 +19,7 @@
-
+
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss index 4b314578b..2e51730cf 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss @@ -93,7 +93,60 @@ ion-content{ border-top-left-radius: 25px; border-top-right-radius: 25px; + .aside{ + border: 1px solid red; + //display: flex; + align-items: center; + justify-content: center; + + .exp-card{ + width: 173px; + height: 200px; + margin: 7px; + //margin: 8px; + //padding: 30px 5px 30px 5px; + border-radius: 15px; + box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07); + //border: solid 1px #e9e9e9; + /* --background-color: #ffffff !important; */ + background-color: #ffffff !important; + float: left; + //border: 1px solid red; + } + .exp-card-icon{ + margin: 0 auto; + } + .exp-card ion-icon{ + font-size: 48px; + } + .exp-card-title{ + font-size: 15px; + color: #0d89d1; + font-family: Roboto; + font-weight: bold; + font-stretch: normal; + font-style: normal; + color: #0d89d1; + margin: 15px 0 0 10px; + text-align: center; + } + .exp-card-title p{ + text-align: center; + + } + .exp-card-content{ + font-size: 13px; + color: #797979; + margin: 11px 0 0; + font-family: Roboto; + font-weight: 700; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + text-align: center; + } } } @@ -116,54 +169,7 @@ ion-content{ font-size: 35px; overflow: auto; } -.exp-card{ - width: 173px; - height: 200px; - margin-right: 14px; - margin-bottom: 14px; - //margin: 8px; - //padding: 30px 5px 30px 5px; - border-radius: 15px; - box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07); - //border: solid 1px #e9e9e9; - /* --background-color: #ffffff !important; */ - background-color: #ffffff !important; - float: left; - border: 1px solid red; -} -.exp-card-icon{ - margin: 0 auto; -} -.exp-card ion-icon{ - font-size: 48px; -} -.exp-card-title{ - font-size: 15px; - color: #0d89d1; - font-family: Roboto; - font-weight: bold; - font-stretch: normal; - font-style: normal; - color: #0d89d1; - margin: 15px 0 0 10px; - text-align: center; -} -.exp-card-title p{ - text-align: center; -} -.exp-card-content{ - font-size: 13px; - color: #797979; - margin: 11px 0 0; - font-family: Roboto; - font-weight: 700; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - text-align: center; -} From 4be1cf455403a0cfc2069a192ad7a7beabf3e1b2 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Sun, 11 Apr 2021 17:08:47 +0100 Subject: [PATCH 3/6] save --- .../gabinete-digital.page.html | 31 +++++++++++++++++-- .../gabinete-digital.page.scss | 10 +++++- 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index da5e3e16e..e3c78ca98 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -60,11 +60,29 @@
- +
-

Despachos

-

- Documentos

+

Diplomas por Validar

+

- Documentos

+ +
+
+ +
+

Expediente Presidente

+

- Documentos

+
+
+
+ +
+

Despacho do Presidente da República

+

- Documentos

+
+ + +
@@ -72,6 +90,13 @@

Diplomas por Validar

- Documentos

+
+
+ +
+

Diplomas assinaldos PR

+

- Documentos

+
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss index 2e51730cf..b0cb7c45d 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss @@ -105,7 +105,7 @@ ion-content{ height: 200px; margin: 7px; //margin: 8px; - //padding: 30px 5px 30px 5px; + padding: 30px 5px 30px 5px; border-radius: 15px; box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07); //border: solid 1px #e9e9e9; @@ -114,6 +114,14 @@ ion-content{ float: left; //border: 1px solid red; } + .exp-card-long{ + width: 100%; + margin: 7px 20px; + border-radius: 15px; + background-color: #ffffff !important; + border: 1px solid red; + } + .exp-card-icon{ margin: 0 auto; } From f2db8e48bb4a9ce3d63607334e1aeb50bd073f53 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Sun, 11 Apr 2021 18:29:14 +0100 Subject: [PATCH 4/6] save --- .../gabinete-digital.page.html | 49 +++++++------- .../gabinete-digital.page.scss | 27 +++++++- .../images/icons-despachos-presidente.svg | 58 +++++++++++++++++ .../icons-diplomas-assinados-presidente.svg | 39 +++++++++++ .../images/icons-expediente-presidente.svg | 65 +++++++++++++++++++ 5 files changed, 211 insertions(+), 27 deletions(-) create mode 100644 src/assets/images/icons-despachos-presidente.svg create mode 100644 src/assets/images/icons-diplomas-assinados-presidente.svg create mode 100644 src/assets/images/icons-expediente-presidente.svg diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index e3c78ca98..458b1fc71 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -13,7 +13,7 @@
- Gabinete Digital + Gabinete Digital @@ -66,33 +66,34 @@

- Documentos

-
-
- -
-

Expediente Presidente

-

- Documentos

-
-
-
- -
-

Despacho do Presidente da República

-

- Documentos

-
- + +
+
+
+ +
+
+

Expediente Presidente

+

- Documentos

+
+
+
+
+
+
+ +
+
+

Despacho do Presidente da República

+

- Documentos

+
+
+
- -
-

Diplomas por Validar

-

- Documentos

-
-
-
- +

Diplomas assinaldos PR

- Documentos

diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss index b0cb7c45d..32c60c1af 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss @@ -12,6 +12,7 @@ ion-content{ text-align: center; } .title-container{ + padding: 30px 20px 0 20px !important; margin-bottom: 15px; .btn-no-color{ display: flex; @@ -87,7 +88,6 @@ ion-content{ margin: 0 auto; background:#ecf8ff; overflow:auto; - border: 1px solid red; padding: 0 !important; margin: 0 !important; @@ -95,7 +95,6 @@ ion-content{ border-top-right-radius: 25px; .aside{ - border: 1px solid red; //display: flex; align-items: center; justify-content: center; @@ -119,7 +118,22 @@ ion-content{ margin: 7px 20px; border-radius: 15px; background-color: #ffffff !important; - border: 1px solid red; + padding: 7px; + .center-div{ + width: fit-content; + margin: 0 auto; + overflow: auto; + } + + .exp-card-icon{ + width: fit-content; + font-size: 48px; + float: left !important; + } + .exp-card-text{ + width: fit-content; + float: left !important; + } } .exp-card-icon{ @@ -186,6 +200,7 @@ ion-content{ .main-content{ .aside-wrapper{ + display: flex; width: 35%; justify-content: flex-start !important; border-right: 1px solid #d8d8d8; @@ -194,6 +209,12 @@ ion-content{ font-size: 25px; text-align: left; } + .exp-card{ + width: 100% !important; + } + .exp-card-long{ + width: 100% !important; + } } .aside-content{ width: 65%; diff --git a/src/assets/images/icons-despachos-presidente.svg b/src/assets/images/icons-despachos-presidente.svg new file mode 100644 index 000000000..cde478727 --- /dev/null +++ b/src/assets/images/icons-despachos-presidente.svg @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/images/icons-diplomas-assinados-presidente.svg b/src/assets/images/icons-diplomas-assinados-presidente.svg new file mode 100644 index 000000000..8508440ec --- /dev/null +++ b/src/assets/images/icons-diplomas-assinados-presidente.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/images/icons-expediente-presidente.svg b/src/assets/images/icons-expediente-presidente.svg new file mode 100644 index 000000000..0344dfe32 --- /dev/null +++ b/src/assets/images/icons-expediente-presidente.svg @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 6c7d58427b15854a8a665b3b2bea7c4c9c6962ad Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Sun, 11 Apr 2021 23:14:31 +0100 Subject: [PATCH 5/6] save --- .../gabinete-digital.page.html | 8 +-- .../gabinete-digital.page.scss | 51 ++++++++++++++++++- 2 files changed, 54 insertions(+), 5 deletions(-) diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 458b1fc71..e44e8b198 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -19,8 +19,8 @@
-
-
+
+
@@ -74,8 +74,8 @@
-

Expediente Presidente

-

- Documentos

+

Expediente Presidente

+

- Documentos

diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss index 32c60c1af..2445e16f0 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss @@ -112,6 +112,7 @@ ion-content{ background-color: #ffffff !important; float: left; //border: 1px solid red; + //justify-content: center; } .exp-card-long{ width: 100%; @@ -119,10 +120,15 @@ ion-content{ border-radius: 15px; background-color: #ffffff !important; padding: 7px; + .center-div{ width: fit-content; margin: 0 auto; overflow: auto; + + .exp-card-title{ + margin: 0 !important; + } } .exp-card-icon{ @@ -131,6 +137,8 @@ ion-content{ float: left !important; } .exp-card-text{ + padding: 0 !important; + margin: 0 !important; width: fit-content; float: left !important; } @@ -204,16 +212,57 @@ ion-content{ width: 35%; justify-content: flex-start !important; border-right: 1px solid #d8d8d8; + + .aside{ + background:transparent; + } .aside-title{ font-family: Roboto; font-size: 25px; text-align: left; } .exp-card{ - width: 100% !important; + width: 90% !important; + justify-content: flex-start !important; + padding: 10px !important; + + .exp-card-title{ + text-align: left !important; + } + } .exp-card-long{ width: 100% !important; + + .center-div{ + display: flex; + justify-content: center; + width: 100%; + margin: 0 !important; + + .exp-card-text{ + width: calc(100% - 50px); + } + } + .title1{ + display: none !important; + + } + .exp-card-title { + flex: 1; + float: left !important; + text-align: left; + padding-left: 10px; + } + .exp-card-content{ + width: fit-content; + float: right; + } + .exp-card-text{ + display: flex; + align-items: center; + justify-content: center; + } } } .aside-content{ From fb6f74214d7955a44ff17ffdbf67b927d506ae9e Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Mon, 12 Apr 2021 00:22:47 +0100 Subject: [PATCH 6/6] save --- src/app/pages/agenda/edit-event/edit-event.page.ts | 4 ++-- .../chat/group-messages/group-messages.page.html | 13 ++++++++----- src/app/pages/chat/messages/messages.page.html | 7 +++++-- .../agenda/edit-event/edit-event.component.ts | 5 ++--- .../chat/group-messages/group-messages.page.html | 8 ++++++-- src/app/shared/chat/messages/messages.page.html | 5 ++++- 6 files changed, 27 insertions(+), 15 deletions(-) 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 a0dd8b2dc..fe1ce1e8c 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -90,12 +90,12 @@ export class EditEventPage implements OnInit { this.postEvent.Attendees = this.taskParticipants.concat(this.taskParticipantsCc) this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => { - const alert = await this.alertController.create({ + /* const alert = await this.alertController.create({ cssClass: 'my-custom-class', header: 'Evento actualizado', buttons: ['OK'] }); - await alert.present(); + await alert.present(); */ }); this.isEventEdited = true; this.modalController.dismiss(this.isEventEdited); diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html index da3cc2b62..fd04d7fbe 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.html +++ b/src/app/pages/chat/group-messages/group-messages.page.html @@ -52,7 +52,8 @@
-