From b5fd1b4f23eefff3de441a4c8e3905a84d951cbc Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 16 Jun 2021 09:11:20 +0100
Subject: [PATCH] Improving agenda

---
 src/app/pages/agenda/agenda.page.html         |  8 ++++----
 src/app/pages/agenda/agenda.page.scss         | 20 +++++++++----------
 src/app/pages/agenda/agenda.page.ts           |  5 ++---
 .../book-meeting-modal.page.ts                |  2 +-
 src/global.scss                               |  9 +++++++--
 5 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index d56fbeab8..a0efae380 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -121,7 +121,7 @@
               <button class="btn-no-color"  *ngIf="showCalendar" (click)="calendarHeight='75px';showCalendar=false">
                 <ion-icon class="collaps btn-no-color" src="assets/images/icons-collaps-up.svg" ></ion-icon>
               </button>
-              <button  class="collaps btn-no-color" *ngIf="!showCalendar" (click)="calendarHeight='333px';showCalendar=true">
+              <button  class="collaps btn-no-color" *ngIf="!showCalendar" (click)="calendarHeight='330px';showCalendar=true">
                 <ion-icon src="assets/images/icons-collaps-down.svg" ></ion-icon>
               </button >
               
@@ -213,7 +213,7 @@
               </div>
             </div> -->
 
-            <div  class="ss-timeline  timeline-mobile flex-grow-1  d-md-none text-black height-100 width-100 overflow-y-auto" >
+            <div  class="ss-timeline hide-scroll timeline-mobile flex-grow-1  d-md-none text-black height-100 width-100 overflow-y-auto" >
               <div *ngFor="let events of TimelineMDList | keyvalue;" >
                 
                 <div *ngIf="CalendarCurrentDay <= events.key">
@@ -256,7 +256,7 @@
               </div>
             </div>
 
-            <div  class="fs-timeline  flex-grow-1 d-none d-md-block  d-md-block text-black  pr-20 width-100 height-100 overflow-y-auto" *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 width-100 height-100 overflow-y-auto" *ngIf="loggeduser.Profile == 'MDGPR'">
               <div *ngFor="let events of TimelineMDList | keyvalue;" >
                 
                 <div *ngIf="CalendarCurrentDay <= events.key">
@@ -297,7 +297,7 @@
               </div>
             </div>
 
-            <div  class="sd-timeline  flex-grow-1 d-none d-md-block timeline-md text-black pl-20 width-100 height-100 overflow-y-auto" >
+            <div  class="sd-timeline hide-scroll flex-grow-1 d-none d-md-block timeline-md text-black pl-20 width-100 height-100 overflow-y-auto" >
               <div *ngFor="let events of TimelinePRList | keyvalue;">
                 
                 <div  *ngIf="CalendarCurrentDay <= events.key">
diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss
index 956477c93..ccc408ebf 100644
--- a/src/app/pages/agenda/agenda.page.scss
+++ b/src/app/pages/agenda/agenda.page.scss
@@ -8,17 +8,17 @@
 }
  
 ion-slide{
-    td{
-        div {
-            padding-left: 7px;
-            border-radius: 28px;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            text-align: center;
-            height: 25px;
-        }
+  td{
+    div {
+      padding-left: 7px;
+      border-radius: 28px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      text-align: center;
+      height: 25px;
     }
+  }
 }
 
 :host ::ng-deep {
diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index f84d707ba..f046a59c7 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -162,7 +162,7 @@ export class AgendaPage implements OnInit {
 
     this.loggeduser = authService.ValidatedUser;
 
-    this.calendarHeight = "333px";
+    this.calendarHeight = "330px";
     this.showCalendar = true;
     this.timelineDate = momentG(new Date(),'dd MMMM yyyy');
 
@@ -173,8 +173,7 @@ export class AgendaPage implements OnInit {
     if(this.loggeduser.Profile == 'MDGPR') {
       this.mobileComponent.showEventList = true;
     }
-
-  
+ 
   }
 
   ngOnInit() {
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 1f525c6c1..c2f61a13e 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
@@ -192,7 +192,7 @@ export class BookMeetingModalPage implements OnInit {
 
       modal.onDidDismiss().then((data) => {
         
-        if(data){
+        if(data) {
           data = data['data'];
 
           const newAttendees: EventPerson[] = data['taskParticipants'];
diff --git a/src/global.scss b/src/global.scss
index 4a4c6ce11..b88a41c69 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -189,8 +189,6 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
     -webkit-transform: rotate(45deg);
     transform: rotate(45deg);
     border-radius: 106px;
-    width: 30px !important;
-    height: 30px;
     padding: 0px !important;
     div.day{
         padding: 0px !important;
@@ -585,6 +583,13 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
         div {
             padding-left: 0px;
         }
+
+    }
+
+    td div:not(.day) {
+        background-color: red;
+        width: 30px !important;
+        height: 30px;
     }
 }