From 93ac1c47366114d65db745bc5935e4f35548ae87 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 11 Jun 2021 15:17:01 +0100 Subject: [PATCH 1/3] Improve --- .../book-meeting-modal/book-meeting-modal.page.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts index f30920797..f07882156 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts @@ -155,8 +155,11 @@ export class BookMeetingModalPage implements OnInit { await this.calendarService.createTaskEvent(this.task.FolderId, this.postData, "pr",this.task.SerialNumber, this.task.FsId).toPromise(); break; } - this.successMessage('Reunião criada') - this.close(); + + this.successMessage('Reunião criada', ()=>{ + this.close(); + }) + } catch (error) { this.badRequest() } From 5f280283c89bac8c98f1bf649d4efd018ef73a28 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Mon, 14 Jun 2021 12:07:07 +0100 Subject: [PATCH 2/3] Improve scroll --- src/app/pages/agenda/agenda.page.html | 3 +- src/app/pages/agenda/agenda.page.scss | 6 ++- src/app/pages/agenda/agenda.page.ts | 8 ++-- src/global.scss | 58 +++++++++++++-------------- 4 files changed, 38 insertions(+), 37 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 54aaa51db..b45fb6b51 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -224,7 +224,7 @@
-
+
{{event.event.StartDate | date: 'HH:mm'}}
@@ -267,6 +267,7 @@
+
{{event.event.StartDate | date: 'HH:mm'}}
--
diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss index 1ed94dde5..956477c93 100644 --- a/src/app/pages/agenda/agenda.page.scss +++ b/src/app/pages/agenda/agenda.page.scss @@ -427,6 +427,7 @@ td.monthview-primary-with-event { font-family: Roboto; font-size: 15px; margin-right: 25px; + width: 55px; } ul{ @@ -710,13 +711,14 @@ app-approve-event{ .filter-Pessoal { - .content-pr-Pessoal, .content-mdgpr-Pessoal { + .content-pr-Oficial, .content-mdgpr-Oficial, .content-md-Pessoal { display: none !important; } } .filter-Oficial { - .content-pr-Oficial, .content-mdgpr-Oficial { + .content-pr-Pessoal, .content-mdgpr-Pessoal, .content-md-Pessoal { display: none !important; } + } \ No newline at end of file diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 3065381a4..d52189326 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -586,7 +586,7 @@ export class AgendaPage implements OnInit { }); }); - const list = this.timelineFilter(this.timelineFilterState, this.eventsList, 'md'); + const list = this.timelineFilter(this.timelineFilterState, this.eventsList, 'mdgpr'); this.TimelineMDList = this.eventListBox(list) @@ -679,7 +679,7 @@ export class AgendaPage implements OnInit { }); }); - const list = this.timelineFilter(this.timelineFilterState, this.eventsListPessoal, 'md'); + const list = this.timelineFilter(this.timelineFilterState, this.eventsListPessoal, 'mdgpr'); this.TimelineMDList = this.eventListBox(list) @@ -759,7 +759,7 @@ export class AgendaPage implements OnInit { }); }); - const list = this.timelineFilter(this.timelineFilterState, this.eventsListOficial, 'md'); + const list = this.timelineFilter(this.timelineFilterState, this.eventsListOficial, 'mdgpr'); this.TimelineMDList = this.eventListBox(list) @@ -853,7 +853,7 @@ export class AgendaPage implements OnInit { }); - const MDEventList = this.timelineFilter(this.timelineFilterState, this.eventsList, 'md'); + const MDEventList = this.timelineFilter(this.timelineFilterState, this.eventsList, 'mdgpr'); diff --git a/src/global.scss b/src/global.scss index 9428fbef0..a7ee0e322 100644 --- a/src/global.scss +++ b/src/global.scss @@ -790,40 +790,38 @@ ion-icon{ -@media only screen and (min-width: 800px) { +::-webkit-scrollbar { + width: 10px; + height: 10px; +} + +/* Track */ +::-webkit-scrollbar-track { +background: #f1f1f1; +border-radius: 5px; +-webkit-border-radius: 5px; +-moz-border-radius: 5px; +-ms-border-radius: 5px; +-o-border-radius: 5px; +} - ::-webkit-scrollbar { - width: 10px; - height: 10px; - } - - /* Track */ - ::-webkit-scrollbar-track { - background: #f1f1f1; - border-radius: 5px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - -ms-border-radius: 5px; - -o-border-radius: 5px; - } - - /* Handle */ - ::-webkit-scrollbar-thumb { - background: #888; - border-radius: 5px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - -ms-border-radius: 5px; - -o-border-radius: 5px; - } - - /* Handle on hover */ - ::-webkit-scrollbar-thumb:hover { - background: rgb(92, 92, 92); - } +/* Handle */ +::-webkit-scrollbar-thumb { +background: #888; +border-radius: 5px; +-webkit-border-radius: 5px; +-moz-border-radius: 5px; +-ms-border-radius: 5px; +-o-border-radius: 5px; +} + +/* Handle on hover */ +::-webkit-scrollbar-thumb:hover { +background: rgb(92, 92, 92); } +// =================================== .hide-scroll::-webkit-scrollbar { display: none !important; } From 0dff00c6a2362997f3d8fef8608f60d571417128 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Mon, 14 Jun 2021 13:33:46 +0100 Subject: [PATCH 3/3] Improve scrollbar --- src/global.scss | 35 +++-------------------------------- 1 file changed, 3 insertions(+), 32 deletions(-) diff --git a/src/global.scss b/src/global.scss index a7ee0e322..37ea09951 100644 --- a/src/global.scss +++ b/src/global.scss @@ -751,40 +751,11 @@ ion-icon{ } - - - - -@media only screen and (min-width: 300px) { +@media only screen and (max-width: 500px) { ::-webkit-scrollbar { - width: 5px; - height: 5px; - } - - /* Track */ - ::-webkit-scrollbar-track { - background: #f1f1f1; - border-radius: 5px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - -ms-border-radius: 5px; - -o-border-radius: 5px; - } - - /* Handle */ - ::-webkit-scrollbar-thumb { - background: #888; - border-radius: 5px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - -ms-border-radius: 5px; - -o-border-radius: 5px; - } - - /* Handle on hover */ - ::-webkit-scrollbar-thumb:hover { - background: rgb(92, 92, 92); + width: 5px !important; + height: 5px !important; } }