Merge branch 'master' of https://github.com/ioet/time-tracker-ui into…

… TT-294-Fex-calendar-text-overflow

src/app/modules/time-entries/components/calendar/calendar.component.scss

@@ -21,6 +21,29 @@ $activity-text-size: $max-lines-activity * $line-height-base;
   @return darken(saturate(adjust-hue($text-color, 6), 46.19), 40.98);
 }
 
+.switch-calendar-view {
+  height: calc(100vh - 320px);
+  overflow-y: auto;
+}
+
+::-webkit-scrollbar {
+  width: 5px;
+}
+
+::-webkit-scrollbar-track {
+  background: #f1f1f1;
+  border-radius: 5px;
+}
+
+::-webkit-scrollbar-thumb {
+  background: transparent;
+}
+
+::-webkit-scrollbar-thumb:hover {
+  background: #888;
+  border-radius: 5px;
+}
+
 @for $card-height from 12 through $max-lines-description {
   $wrap-height: ($card-height * 0.625rem) -
     $project-text-size -

src/app/modules/time-entries/components/calendar/calendar.component.ts

@@ -23,12 +23,14 @@ import { differenceInMinutes, startOfDay, startOfHour } from 'date-fns';
   styleUrls: ['./calendar.component.scss'],
 })
 export class CalendarComponent implements OnInit {
-  readonly HALF_HOUR: number = 30;
+  readonly DEFAULT_HEADER_HEIGHT = 52;
   readonly VARIATION_HEIGHT: number = 2;
   readonly VISIBLE_TARGETS_FOR_TIME_ENTRIES_DESCRIPTION: CalendarView[] = [CalendarView.Week, CalendarView.Day];
   readonly CALENDAR_VIEW_ENUM: typeof CalendarView = CalendarView;
 
-  @Input() set timeEntries$(timeEntries: Observable<DataSource<Entry>>){
+  @ViewChild('scrollContainer') scrollContainer: ElementRef<HTMLElement>;
+
+  @Input() set timeEntries$(timeEntries: Observable<DataSource<Entry>>) {
     this.castEntryToCalendarEvent(timeEntries);
   }
   @Input() calendarView: CalendarView = CalendarView.Month;
@@ -59,6 +61,14 @@ export class CalendarComponent implements OnInit {
     this.navigationEnable(this.calendarView);
   }
 
+  scrollToCurrentTimeMarker() {
+    if (this.calendarView === CalendarView.Week || CalendarView.Day) {
+      const minutesSinceStartOfDay = differenceInMinutes(startOfHour(this.currentDate), startOfDay(this.currentDate));
+      const headerHeight = this.calendarView === CalendarView.Week ? this.DEFAULT_HEADER_HEIGHT : 0;
+      this.scrollContainer.nativeElement.scrollTop = minutesSinceStartOfDay * this.VARIATION_HEIGHT + headerHeight;
+    }
+  }
+
   castEntryToCalendarEvent(timeEntries$: Observable<DataSource<Entry>>) {
     timeEntries$
       .pipe(
@@ -131,6 +141,7 @@ export class CalendarComponent implements OnInit {
     return new SubstractDatePipe().transformInMinutes(endDate, startDate);
   }
 
+  timeIsGreaterThan(startDate: Date, endDate: Date, timeRange: number): boolean {
   getCardEntryHeight(startDate: Date, endDate: Date): number{
     const heightCard = this.getTimeWork(startDate, endDate) * this.VARIATION_HEIGHT;
     const finalHeightCard = heightCard / 10;