diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts index 14220cdfb..e7852477f 100644 --- a/src/app/home/home-routing.module.ts +++ b/src/app/home/home-routing.module.ts @@ -87,7 +87,7 @@ const routes: Routes = [ }, { path: 'emend-message-modal', - loadChildren: () => import('../pages/agenda/emend-message-modal/emend-message-modal.module').then( m => m.EmendMessageModalPageModule) + loadChildren: () => import('../pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.module').then( m => m.ApproveEventModalPageModule) }, ] }, 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 890f43b86..a9b3dd04a 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -89,12 +89,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 @@ - -
+
- Gabinete Digital -
-
-
+
+

Eventos para Aprovação

{{count_ev_md+count_ev_pr}} Documentos

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

Correspondencia

{{count_exp_dailywork}} Documentos

+
@@ -56,13 +58,6 @@

Pedidos de Deferimento

- Documentos

-
-
- -
-

Despachos

-

- Documentos

-
@@ -70,6 +65,55 @@

Diplomas por Validar

- Documentos

+ + +
+
+ +
+

Expediente Presidente

+

- Documentos

+
+
+
+ +
+

Despacho do Presidente da República

+

- Documentos

+
+ + + +
+
+
+ +
+
+

Expediente Presidente

+

- Documentos

+
+
+
+
+
+
+ +
+
+

Despacho do Presidente da República

+

- 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 fe9b1c2f2..3a3b9b069 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,10 +88,96 @@ ion-content{ margin: 0 auto; background:#ecf8ff; overflow:auto; + padding: 0 !important; + margin: 0 !important; border-top-left-radius: 25px; border-top-right-radius: 25px; + .aside{ + //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; + //justify-content: center; + } + .exp-card-long{ + width: 360px; + margin: 7px 20px; + border-radius: 15px; + background-color: #ffffff !important; + padding: 7px; + border: blue !important; + + .center-div{ + width: fit-content; + margin: 0 auto; + overflow: auto; + + .exp-card-title{ + margin: 0 !important; + } + } + + .exp-card-icon{ + width: fit-content; + font-size: 48px; + float: left !important; + } + .exp-card-text{ + padding: 0 !important; + margin: 0 !important; + width: fit-content; + float: left !important; + } + } + + .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; + } } } @@ -113,67 +200,85 @@ ion-content{ font-size: 35px; overflow: auto; } -.exp-card{ - width: 174px; - height: 200px; - 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; -} -.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; -} +@media only screen and (min-width: 561px) { + .exp-card-long{ + width: 547px !important; + } +} +@media only screen and (min-width: 749px) { + .exp-card-long{ + width: 734px !important; + } +} @media only screen and (min-width: 801px) { .main-content{ .aside-wrapper{ + display: flex; width: 35%; justify-content: flex-start !important; border-right: 1px solid #d8d8d8; + + .aside{ + background:transparent; + + .d-none{ + display: block; + } + } .aside-title{ font-family: Roboto; font-size: 25px; text-align: left; } + .exp-card{ + width: 90% !important; + justify-content: flex-start !important; + padding: 10px !important; + + .exp-card-title{ + text-align: left !important; + } + + } + .exp-card-long{ + display: none !important; + 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{ width: 65%; @@ -209,7 +314,16 @@ ion-content{ //display: none; margin-top: 0px !important; } - } + } + .exp-card:visited{ + background: blue; + } + .exp-card:hover{ + background: blue; + } +} +.btn-refresh:visited{ + background: blue !important; } @media only screen and (min-width: 1024px){ .content{ diff --git a/src/app/shared/agenda/edit-event/edit-event.component.ts b/src/app/shared/agenda/edit-event/edit-event.component.ts index de98a7632..965bd374d 100644 --- a/src/app/shared/agenda/edit-event/edit-event.component.ts +++ b/src/app/shared/agenda/edit-event/edit-event.component.ts @@ -95,13 +95,12 @@ export class EditEventComponent implements OnInit { this.postEvent.Attendees = this.taskParticipants.concat(this.taskParticipantsCc); await 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(); */ }); 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 58a589073..ee3c49a3f 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.html +++ b/src/app/shared/chat/group-messages/group-messages.page.html @@ -54,6 +54,7 @@
+
@@ -68,8 +69,11 @@
- +
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html index ca4efdb83..63ad72653 100644 --- a/src/app/shared/chat/messages/messages.page.html +++ b/src/app/shared/chat/messages/messages.page.html @@ -61,7 +61,10 @@
- +
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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +