From 1e40220b6e3bca0c1ae4b1e7baec0b08d1a6e09b Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 27 Jul 2021 10:17:56 +0100
Subject: [PATCH] Improve colors

---
 src/app/pages/agenda/agenda.page.html | 9 ++++-----
 src/app/pages/events/events.page.html | 3 ++-
 src/global.scss                       | 8 ++++----
 src/theme/variables.scss              | 8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index 4a7972bf8..4d469b2e3 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -20,7 +20,8 @@
         
         <div>
           <!--  Calendar is here -->
-          <div class="calendar-segment-{{profile}}">
+          <div class="calendar-segment-{{profile}}" [class.calendar-segment-pr-force]="loggeduser.Profile =='PR'">
+            {{profile}} {{ loggeduser.Profile }}
             <div class="calendar-container"  [style.height]="calendarHeight">
 
               <ion-row class="ion-justify-content-between calendar-tool-tip">
@@ -52,11 +53,11 @@
                 </ion-row>
                 <ion-row class="ion-align-items-center">
 
-                  <button *ngIf="profile == 'mdgpr' " (click)="changeProfile()" class="d-md-none btn-no-color">
+                  <button *ngIf="profile == 'mdgpr' && loggeduser.Profile =='MDGPR' " (click)="changeProfile()" class="d-md-none btn-no-color">
                     <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">
+                  <button  *ngIf="profile == 'pr' && loggeduser.Profile =='MDGPR' " (click)="changeProfile()" class="btn-no-color">
                     <ion-icon class="right-icons d-md-none" src="assets/images/icons-profile-calendar-pr.svg"></ion-icon>
                   </button>
 
@@ -174,8 +175,6 @@
 
         <!-- Timeline -->
 
-        
-
         <div class="height-100">
           <div class="timeline-container height-100 d-flex pt-20 pl-20 pl-20 filter-{{segment}}"  >
 
diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html
index a3185ad29..9b3866f23 100644
--- a/src/app/pages/events/events.page.html
+++ b/src/app/pages/events/events.page.html
@@ -48,7 +48,8 @@
             <ion-item class="cursor-pointer" lines="none" *ngFor="let event of toDayEventStorage.eventsList"
             (click)="goToEvent(event.EventId)"
             >
-            <div class="d-flex  content-{{profile}}-{{event.CalendarName}}">
+            <div class="d-flex  content-{{loggeduser.Profile}}-{{event.CalendarName}}">
+
               <div class="schedule-time">
                 <div class="time-start">{{event.StartDate | date: 'HH:mm'}}</div>
                 <div class="time-end">{{event.EndDate | date: 'HH:mm'}}</div>
diff --git a/src/global.scss b/src/global.scss
index ffbb9b6c6..d3f1e1b5e 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -749,13 +749,13 @@ ion-content {
 }
 .header-default-padding{
     padding: 30px 20px 0 20px !important;
-  }
+}
+
 .content-default-padding{
    padding: 0px 20px 0 20px !important;
 }
 
 
-
 .chat-popover .popover-content {
     width: 100% !important;
     left: 0 !important;
@@ -1065,7 +1065,7 @@ ngx-mat-datetime-content{
 
 
 @media only screen and (max-width: 1024px) {
-    .calendar-segment-mdgpr {
+    .calendar-segment-mdgpr:not(.calendar-segment-pr-force) {
         .calendar-pr-event-type-Oficial {
             border-right: 3px solid transparent !important;
         }
@@ -1082,4 +1082,4 @@ ngx-mat-datetime-content{
             border-left: 3px solid transparent !important;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/theme/variables.scss b/src/theme/variables.scss
index 22a9e4e0c..c09c7af4e 100644
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@@ -382,25 +382,25 @@ $app-theme: mat-light-theme((
   margin-bottom: 10px;
   overflow: auto;
 }
-.content-pr-Oficial{
+.content-pr-Oficial, .content-PR-Oficial{
   width: 340px;
   border-radius: 5px;
   border-right: 5px solid #99e47b;
   overflow: auto;
 }
-.content-pr-Pessoal{
+.content-pr-Pessoal, .content-PR-Pessoal{
   width: 340px;
   border-radius: 5px;
   border-right: 5px solid #958bfc;
   overflow: auto;
 }
-.content-mdgpr-Oficial{
+.content-mdgpr-Oficial, .content-MDGPR-Oficial{
   width: 340px;
   border-radius: 5px;
   border-right: 5px solid #ffb703;
   overflow: auto;
 }
-.content-mdgpr-Pessoal{
+.content-mdgpr-Pessoal, .content-MDGPR-Pessoal{
   width: 340px;
   border-radius: 5px;
   border-right: 5px solid #f05d5e;