From 87b17e09f3ad495e5c4f8c40f0b6cd943d00ce66 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 7 Apr 2021 15:01:03 +0100 Subject: [PATCH] save --- .../emend-message-modal/emend-message-modal.page.html | 10 +++------- .../emend-message-modal/emend-message-modal.page.scss | 9 ++++++++- .../emend-message-modal/emend-message-modal.page.ts | 2 +- .../pages/gabinete-digital/gabinete-digital.page.html | 5 ++++- .../pages/gabinete-digital/gabinete-digital.page.scss | 9 +++++++++ .../pages/gabinete-digital/gabinete-digital.page.ts | 2 ++ .../events-to-approve/events-to-approve.page.html | 5 ++++- .../events-to-approve/events-to-approve.page.scss | 9 +++++++++ 8 files changed, 40 insertions(+), 11 deletions(-) diff --git a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html index cccbb6bd7..48207f9d6 100644 --- a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html +++ b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html @@ -15,12 +15,8 @@ - -
- - Cancelar - Gravar - +
+ +
- diff --git a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.scss b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.scss index 54851ac15..58229d622 100644 --- a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.scss +++ b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.scss @@ -1,5 +1,5 @@ .header-content{ - width: 360px; + //width: 360px; overflow: auto; margin: 25px auto; } @@ -38,4 +38,11 @@ border-radius: 22.5px; --background: #42b9fe; margin: 0 0px 0 12px; + } + .buttons{ + display: flex; + width: 100% !important; + justify-content: space-between; + padding: 15px; + overflow: auto; } \ No newline at end of file diff --git a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts index bec2232f3..241c43cb1 100644 --- a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts +++ b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts @@ -18,7 +18,7 @@ export class EmendMessageModalPage implements OnInit { ngOnInit() { } close(){ - this.modalController.dismiss(); + this.modalController.dismiss(''); } save(){ this.modalController.dismiss(this.emendMessage); diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 4c8e1798a..1ead4f280 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -12,7 +12,10 @@
-

Gabinete Digital

+
+ Gabinete Digital + +
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss index 16aecaf24..438588a29 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss @@ -11,6 +11,15 @@ ion-content{ ion-card-title{ text-align: center; } + .title-container{ + margin-bottom: 15px; + .title-icon{ + float: right; + margin-right: 20px; + font-size: 30px; + color: #0782c9; + } + } ion-card{ background-color: #d4d5ca; diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 07e3f3810..be7cb9a58 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -160,6 +160,8 @@ this.processesbackend.GetActionsList().subscribe(res=>{ } doRefresh(event) { + this.closeAllDesktopComponents(); + this.showEmptyContainer = true; this.LoadCounts(); setTimeout(() => { diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html index 77933ac48..dfa1cf7bb 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html @@ -1,6 +1,9 @@
- +
+ + +
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss index 7727a9871..3ccafbb04 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss @@ -2,6 +2,15 @@ padding: 30px 20px 0 20px !important; margin: 0; } +.title-container{ + margin-bottom: 15px; + .title-icon{ + float: right; + margin-right: 20px; + font-size: 30px; + color: #0782c9; + } +} .title{ font-family: Roboto; font-size: 25px;