Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

src/app/pages/agenda/agenda.page.html

@@ -46,12 +46,12 @@
                 </ion-row>
                 <ion-row class="ion-align-items-center">
 
-                  <button *ngIf="profile == 'mdgpr' " (click)="changeProfile()" class="right-icons d-md-none btn-no-color">
+                  <button *ngIf="profile == 'mdgpr' " (click)="changeProfile()" class="d-md-none btn-no-color">
-                    <ion-icon   src="assets/images/icons-profile-calendar-md.svg">ddddddd</ion-icon>
+                    <ion-icon class="right-icons" src="assets/images/icons-profile-calendar-md.svg"></ion-icon>
                   </button>
                   
                   <button  *ngIf="profile == 'pr' " (click)="changeProfile()" class="btn-no-color">
-                    <ion-icon class="right-icons d-md-none" src="assets/images/icons-profile-calendar-pr.svg">dddddddd</ion-icon>
+                    <ion-icon class="right-icons d-md-none" src="assets/images/icons-profile-calendar-pr.svg"></ion-icon>
                   </button>
 
                   <button class="btn-no-color" (click)="viewEventsToApprove()" *ngIf="loggeduser.Profile == 'MDGPR'">
@@ -109,14 +109,12 @@
               </ng-template>
             </div>
 
-
           </div>
       
           <div class="calendar-border">
             
           </div>
       
-      
           <!-- Calendar currente date -->
           <ion-row class="timeline-header ion-justify-content-between ion-align-items-center currente-date-timelien pb-5">
             <ion-row class="timeline-date align-center">
@@ -164,7 +162,7 @@
         </div>
 
       </div>
-      <div class="timeline-wrapper flex-grow-1" >
+      <div class="timeline-wrapper flex-grow-1 height-100" >
         <!-- Progress bar -->
         <ion-refresher  name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
           <ion-refresher-content>
@@ -172,8 +170,8 @@
         </ion-refresher>
 
         <!-- Timeline -->
-        <div>
+        <div class="height-100">
-          <div class="timeline-container d-flex py-20" >
+          <div class="timeline-container height-100 d-flex pt-20 pl-20" >
             
             <!-- <div [ngSwitch]="view" class="ss-timeline timeline-mobile flex-grow-1  d-md-none">
               <mwl-calendar-day-view
@@ -215,10 +213,10 @@
               </div>
             </div> -->
 
-            <div  class="ss-timeline timeline-mobile flex-grow-1  d-md-none text-black pl-20" >
+            <div  class="ss-timeline hide-scroll timeline-mobile flex-grow-1  d-md-none text-black height-100 overflow-y-auto" >
               <div *ngFor="let events of TimelineMDList | keyvalue;" >
                 
-                <div >
+                <div *ngIf="CalendarCurrentDay <= events.key">
                   <div class="day mt-10">
                     {{ TimelineDayEvent(events.key)}}
                   </div>
@@ -256,10 +254,10 @@
               </div>
             </div>
 
-            <div  class="fs-timeline flex-grow-1 d-none d-md-block  d-md-block text-black pl-20 pr-20" *ngIf="loggeduser.Profile == 'MDGPR'">
+            <div  class="fs-timeline hide-scroll flex-grow-1 d-none d-md-block  d-md-block text-black  pr-20 height-100 mr-md-20 overflow-y-auto" *ngIf="loggeduser.Profile == 'MDGPR'">
               <div *ngFor="let events of TimelineMDList | keyvalue;" >
                 
-                <div >
+                <div *ngIf="CalendarCurrentDay <= events.key">
                   <div class="day mt-10">
                     {{ TimelineDayEvent(events.key)}}
                   </div>
@@ -294,10 +292,10 @@
               </div>
             </div>
 
-            <div  class="sd-timeline flex-grow-1 d-none d-md-block timeline-md text-black pr-20" >
+            <div  class="sd-timeline hide-scroll flex-grow-1 d-none d-md-block timeline-md text-black pr-20 height-100 overflow-y-auto" >
               <div *ngFor="let events of TimelinePRList | keyvalue;">
                 
-                <div >
+                <div  *ngIf="CalendarCurrentDay <= events.key">
                         
                   <div class="day mt-10">
                     {{ TimelineDayEvent(events.key)}}

src/app/pages/agenda/agenda.page.scss

@@ -605,8 +605,8 @@ td.monthview-primary-with-event {
 
     .timeline-wrapper{
       width: 100%;
-      overflow: scroll;
+      overflow: auto;
-      overflow-x: hidden; 
+      // overflow-x: hidden; 
     }
   }
 }
@@ -699,6 +699,3 @@ app-approve-event{
   align-items: center;
   height: 100%;
 }
-
-
-

src/app/pages/agenda/agenda.page.ts

@@ -378,6 +378,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');

src/app/pages/agenda/view-event/view-event.page.scss

@@ -16,7 +16,6 @@ ion-menu{
   .main-header{
     font-family: Roboto;
     background-color: #fff;
-    overflow:hidden;
     color:#000;
     transform: translate3d(0, 1px, 0);
     
@@ -29,7 +28,6 @@ ion-menu{
         width: 37px;
         float: left;
         font-size: 35px;
-        overflow: hidden;
       }
       .middle{
           //width: 230px;
@@ -208,7 +206,6 @@ ion-menu{
           width: 37px;
           float: right;
           font-size: 35px;
-          overflow: hidden;
       }
     }
     .buttons{

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"];

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

src/app/shared/agenda/approve-event/approve-event.page.ts

@@ -50,6 +50,7 @@ export class ApproveEventPage implements OnInit {
     private animationController: AnimationController
   ) { 
     // $$$
+
   }
 
   ngOnInit() {

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;

src/global.scss

@@ -748,3 +748,96 @@ ion-icon{
         height: 300px;
     }  
 }
+
+
+
+
+
+
+@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;
+}