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

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

@@ -149,7 +149,7 @@
             </ion-row>
           </ion-row>
           
-          <div class="pb-5  d-none d-md-flex">
+          <div class="pb-5  d-none d-md-flex" *ngIf="loggeduser.Profile == 'MDGPR'">
             <div class="flex-grow-1 text-grey d-flex justify-center align-center">
               <div>Própria</div>
             </div>
@@ -185,7 +185,7 @@
               </mwl-calendar-day-view>
             </div>
   
-            <div [ngSwitch]="view" class="fs-timeline flex-grow-1 d-none d-md-block" >
+            <div [ngSwitch]="view" class="fs-timeline flex-grow-1 d-none d-md-block" *ngIf="loggeduser.Profile == 'MDGPR'">
               <mwl-calendar-day-view
                 *ngSwitchCase="'day'"
                 [viewDate]="viewDate"

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

@@ -538,7 +538,7 @@ export class AgendaPage implements OnInit {
           //this.eventSource=[];
           
   
-          if(this.profile == "mdgpr") {
+          if(this.loggeduser.Profile == 'MDGPR' ) {
              this.eventService.getAllMdEvents( momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59') ).subscribe(
               response => {
 
@@ -627,7 +627,7 @@ export class AgendaPage implements OnInit {
         case "Pessoal":
           //Inicializa o array eventSource
 
-          if(this.profile == "mdgpr") {
+          if(this.loggeduser.Profile == 'MDGPR') {
             this.eventService.getAllMdEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe(response => {
                 
               this.eventSource=[];
@@ -703,7 +703,7 @@ export class AgendaPage implements OnInit {
           //Inicializa o array eventSource
           this.eventsListOficial = [];
 
-          if(this.profile == "mdgpr") {
+          if(this.loggeduser.Profile == 'MDGPR') {
             this.eventService.getAllMdEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe(res => {
               this.eventSource=[];  
               this.eventsListOficial = res.filter(data => data.CalendarName == "Oficial");
@@ -779,56 +779,59 @@ export class AgendaPage implements OnInit {
       // calendar
       let counter = 0;
       
-      this.eventService.getAllMdEvents( momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59') ).subscribe(
+      if(this.loggeduser.Profile == 'MDGPR') {
-         response => {
+        this.eventService.getAllMdEvents( momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59') ).subscribe(
-
+          response => {
-
-          if(this.segment == 'Oficial') {
-            this.eventsList = response.filter(data => data.CalendarName == "Oficial");
-          } else if (this.segment == 'Pessoal') {
-            this.eventsList = response.filter(data => data.CalendarName == "Pessoal");
-          } else {
-            this.eventsList = response;
-          }
-          
-          this.eventSource= this.eventSource.filter(e => e.profile != 'md');
-          // loop
-          this.eventsList.forEach((element, eventIndex) => {
-
-            // calendar
-            this.eventSource.push({
-              index: eventIndex,
-              title: element.Subject,
-              startTime: new Date(element.StartDate),
-              endTime: new Date(element.EndDate),
-              allDay: false,
-              event: element,
-              calendarName: element.CalendarName,
-              profile: 'md',
-              id: element.EventId,
-            });
-
-          });
-
-          const MDEventList = this.timelineFilter(this.timelineFilterState, this.eventsList, 'md');
-
-          this.events = MDEventList;
-          this.TimelineMD = MDEventList;
-
-          this.myCal.update();
-          this.myCal.loadEvents();
-
-          this.showTimelineMD = true;
-
-          counter++;
-          if(counter==2){
-            this.showLoader = false;
-            this.timelineBoxCorrectHeight(500);
-            this.centralizeTimeline(500);
-          }
-          
-      });
  
+ 
+           if(this.segment == 'Oficial') {
+             this.eventsList = response.filter(data => data.CalendarName == "Oficial");
+           } else if (this.segment == 'Pessoal') {
+             this.eventsList = response.filter(data => data.CalendarName == "Pessoal");
+           } else {
+             this.eventsList = response;
+           }
+           
+           this.eventSource= this.eventSource.filter(e => e.profile != 'md');
+           // loop
+           this.eventsList.forEach((element, eventIndex) => {
+ 
+             // calendar
+             this.eventSource.push({
+               index: eventIndex,
+               title: element.Subject,
+               startTime: new Date(element.StartDate),
+               endTime: new Date(element.EndDate),
+               allDay: false,
+               event: element,
+               calendarName: element.CalendarName,
+               profile: 'md',
+               id: element.EventId,
+             });
+ 
+           });
+ 
+           const MDEventList = this.timelineFilter(this.timelineFilterState, this.eventsList, 'md');
+ 
+           this.events = MDEventList;
+           this.TimelineMD = MDEventList;
+ 
+           this.myCal.update();
+           this.myCal.loadEvents();
+ 
+           this.showTimelineMD = true;
+ 
+           counter++;
+           if(counter==2){
+             this.showLoader = false;
+             this.timelineBoxCorrectHeight(500);
+             this.centralizeTimeline(500);
+           }
+           
+       });
+      }
+
+      
       this.eventService.getAllPrEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe(
         response => {
     
@@ -869,7 +872,7 @@ export class AgendaPage implements OnInit {
           
           counter++;
 
-          if(counter==2){
+          if(counter==2 || this.loggeduser.Profile == 'PR') {
             this.showLoader = false;
             this.timelineBoxCorrectHeight(500);
             this.centralizeTimeline(500);

src/global.scss

@@ -382,6 +382,7 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
         right: 0px;
         height: 100%;
         width: 400px;
+    }
 }
 }
 
@@ -528,25 +529,23 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
 
 
 
-// timeline
+.timeline-container {
-.sd-timeline{
+    div:nth-child(3) {
-    .cal-time{
+        .cal-time{
-      display: none;
+            display: none;
-    }
+          }
-    .cal-current-time-marker::before {
+          .cal-current-time-marker::before {
-      display: none !important;
+            display: none !important;
-    }
+          }
-  
+        
-    .timeline-box{
+          .timeline-box{
-        left: -13%;
+              left: -13%;
-        position: relative;
+              position: relative;
-        width: 113%;
+              width: 113%;
+          }
     }
 }
 
-
-
-
 .timeline{
     div.cal-event:focus{
         outline: none !important;
@@ -677,7 +676,7 @@ ion-content {
     top: calc(100% - 160px) !important;
     max-height: 160px;
     min-height: 160px; 
-  }
+}
 
 
 .monthview-secondary-with-event, .text-muted {