From 2ba4a4a29dcde0a689c6df81dc814f030540d3b9 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 10 Jun 2021 11:20:41 +0100 Subject: [PATCH 1/4] Improve event list --- src/app/pages/agenda/agenda.page.html | 6 +++--- src/app/pages/agenda/view-event/view-event.page.html | 2 +- .../event-list/approve-event/approve-event.page.ts | 1 + .../expediente/expediente-detail/expediente-detail.page.ts | 6 +----- src/app/pages/gabinete-digital/gabinete-digital.page.scss | 4 ++-- src/app/shared/agenda/approve-event/approve-event.page.ts | 1 + 6 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 4c32025ef..0aeb716df 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -173,7 +173,7 @@
-
+
-
+
@@ -256,7 +256,7 @@
-
+
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 e6fb685b3..6320eac23 100644 --- a/src/app/pages/agenda/view-event/view-event.page.html +++ b/src/app/pages/agenda/view-event/view-event.page.html @@ -42,7 +42,7 @@
{{loadedEvent.Subject}}
-
+
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 126b093e5..42046eaa9 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 @@ -50,6 +50,7 @@ export class ApproveEventPage implements OnInit { private animationController: AnimationController, private toastService: ToastService, ) { + this.activatedRoute.queryParams.subscribe(params => { if(params["serialNumber"]) { this.serialNumber = params["serialNumber"]; diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index c3aa7b388..b278b1b47 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -57,6 +57,7 @@ export class ExpedienteDetailPage implements OnInit { private animationController: AnimationController ) { + this.activatedRoute.queryParams.subscribe(params => { if(params["serialNumber"]) { @@ -94,10 +95,8 @@ export class ExpedienteDetailPage implements OnInit { this.toastService.presentToast('Não foi possível fazer login"'); } - goBack() { - this.activatedRoute.queryParams.subscribe(params => { if(params["from"] == "inicio") { @@ -120,9 +119,6 @@ export class ExpedienteDetailPage implements OnInit { } - - - }); } diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss index a9a7fc272..cf740dc3d 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss @@ -8,8 +8,8 @@ ion-content{ } :host{ // background: #0782c9; - ion-card-title{ - text-align: center; + ion-card-title { + text-align: center; } .title-container{ padding: 30px 20px 0 20px !important; diff --git a/src/app/shared/agenda/approve-event/approve-event.page.ts b/src/app/shared/agenda/approve-event/approve-event.page.ts index 432fd955d..321717fb4 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.ts +++ b/src/app/shared/agenda/approve-event/approve-event.page.ts @@ -50,6 +50,7 @@ export class ApproveEventPage implements OnInit { private animationController: AnimationController ) { // $$$ + } ngOnInit() { From 837111d7ce47c1b8c53b00c1912867c99aa61347 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 10 Jun 2021 14:00:44 +0100 Subject: [PATCH 2/4] Improve --- src/app/pages/agenda/agenda.page.html | 22 +++++++++---------- src/app/pages/agenda/agenda.page.scss | 4 ++-- .../agenda/view-event/view-event.page.scss | 3 --- .../gabinete-digital.page.scss | 2 +- src/app/pages/login/login.page.ts | 1 + .../agenda/view-event/view-event.page.scss | 4 ++-- 6 files changed, 16 insertions(+), 20 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 0aeb716df..d444daa6d 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -46,12 +46,12 @@ -
-
- @@ -164,16 +162,16 @@
-
- +
+ -
-
+
+
-
+
@@ -256,7 +254,7 @@
-
+
@@ -294,7 +292,7 @@
-
+
diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss index 5ed340a03..2630a033a 100644 --- a/src/app/pages/agenda/agenda.page.scss +++ b/src/app/pages/agenda/agenda.page.scss @@ -605,8 +605,8 @@ td.monthview-primary-with-event { .timeline-wrapper{ width: 100%; - overflow: scroll; - overflow-x: hidden; + overflow: auto; + // overflow-x: hidden; } } } diff --git a/src/app/pages/agenda/view-event/view-event.page.scss b/src/app/pages/agenda/view-event/view-event.page.scss index 61f3a3c9d..583a4ff9d 100644 --- a/src/app/pages/agenda/view-event/view-event.page.scss +++ b/src/app/pages/agenda/view-event/view-event.page.scss @@ -15,7 +15,6 @@ ion-menu{ .main-header{ font-family: Roboto; background-color: #fff; - overflow:hidden; color:#000; transform: translate3d(0, 1px, 0); @@ -28,7 +27,6 @@ ion-menu{ width: 37px; float: left; font-size: 35px; - overflow: hidden; } .middle{ //width: 230px; @@ -206,7 +204,6 @@ ion-menu{ width: 37px; float: right; font-size: 35px; - overflow: hidden; } } .buttons{ diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss index cf740dc3d..d4e0cca6a 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss @@ -81,7 +81,7 @@ ion-content{ /* NEW CSS */ -.main-content{ +.main-content { width: 100%; /* 400px */ height: 100%; font-family: Roboto; diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index a807cb999..61caa66f5 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -77,6 +77,7 @@ export class LoginPage implements OnInit { this.username.trim().length > 0 ); } + validatePassword() { return ( this.password.trim().length > 0 diff --git a/src/app/shared/agenda/view-event/view-event.page.scss b/src/app/shared/agenda/view-event/view-event.page.scss index a5f496ec9..5202cb708 100644 --- a/src/app/shared/agenda/view-event/view-event.page.scss +++ b/src/app/shared/agenda/view-event/view-event.page.scss @@ -32,7 +32,7 @@ ion-menu{ width: 37px; float: left; font-size: 35px; - overflow: hidden; + } .middle{ padding: 0 0 0 10px !important; @@ -54,7 +54,7 @@ ion-menu{ padding: 1px !important; top: 0 !important; margin: 0 !important; - overflow: hidden; + } .div-icon .edit{ font-size: 35px; From ad6b26053fa19ff0e4e3bf6c7fa064e56d77851b Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 10 Jun 2021 14:58:44 +0100 Subject: [PATCH 3/4] improve scroll --- src/app/pages/agenda/agenda.page.html | 6 +- src/app/pages/agenda/agenda.page.scss | 5 +- src/global.scss | 95 ++++++++++++++++++++++++++- src/style/main.scss | 6 +- 4 files changed, 101 insertions(+), 11 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index d444daa6d..41190dfb9 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -213,7 +213,7 @@
--> -
+
@@ -254,7 +254,7 @@
-
+
@@ -292,7 +292,7 @@
-
+
diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss index 2630a033a..9228e1166 100644 --- a/src/app/pages/agenda/agenda.page.scss +++ b/src/app/pages/agenda/agenda.page.scss @@ -698,7 +698,4 @@ app-approve-event{ display: flex; align-items: center; height: 100%; -} - - - +} \ No newline at end of file diff --git a/src/global.scss b/src/global.scss index 89eead7d3..6ac9e5efb 100644 --- a/src/global.scss +++ b/src/global.scss @@ -747,4 +747,97 @@ ion-icon{ height: fit-content; height: 300px; } -} \ No newline at end of file +} + + + + + + +@media only screen and (min-width: 500px) { + + ::-webkit-scrollbar { + width: 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); + } +} + + + +@media only screen and (min-width: 800px) { + + ::-webkit-scrollbar { + width: 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); + } +} + + + + +.hide-scroll::-webkit-scrollbar { + display: none !important; +} + + /* Track */ +.hide-scroll::-webkit-scrollbar-track { + display: none !important; +} + +/* Handle */ +.hide-scroll::-webkit-scrollbar-thumb { + display: none !important; +} + +/* Handle on hover */ +.hide-scroll::-webkit-scrollbar-thumb:hover { + display: none !important; +} diff --git a/src/style/main.scss b/src/style/main.scss index bced407fd..1549a2300 100644 --- a/src/style/main.scss +++ b/src/style/main.scss @@ -289,9 +289,9 @@ .height-lg-unset{ height: unset !important;} @for $i from 0 through 50 { - .font-lg-#{$i} { - font-size: #{$i}px ; - } + .font-lg-#{$i} { + font-size: #{$i}px ; + } } @for $i from 0 through 10 { From 6100b3276442ccfea0ac9706d77fd8e691fa4b03 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 10 Jun 2021 15:08:35 +0100 Subject: [PATCH 4/4] Improve --- src/app/pages/agenda/agenda.page.html | 6 +++--- src/app/pages/agenda/agenda.page.ts | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 41190dfb9..bda24ae27 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -216,7 +216,7 @@
-
+
{{ TimelineDayEvent(events.key)}}
@@ -257,7 +257,7 @@
-
+
{{ TimelineDayEvent(events.key)}}
@@ -295,7 +295,7 @@
-
+
{{ TimelineDayEvent(events.key)}} diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 72803b4d0..1dd4b11dc 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -376,6 +376,12 @@ export class AgendaPage implements OnInit { } + get CalendarCurrentDay () { + + console.log(this.viewDate.getDate(), '0_0') + return this.viewDate.getDate() + } + // for timeline timelineIsCurrentDate(): Boolean { return momentG(new Date(),'dd MMMM yyyy', 'pt') == momentG(this.eventSelectedDate,'dd MMMM yyyy', 'pt');