Merge pull request #247 from bwsw/232-activity-log

(closes #232) Fix activity log dates

Author: andrewbents

src/app/events/event-list.component.html

@@ -8,7 +8,7 @@
         [DateTimeFormat]="dateTimeFormat"
         [cancelLabel]="'CANCEL' | translate"
         [(ngModel)]="date"
-        (ngModelChange)="getEvents({ reload: true })"
+        (change)="getEvents({ reload: true })"
       ></cs-date-picker>
 
       <mdl-select

src/app/events/event-list.component.ts

@@ -55,6 +55,7 @@ export class EventListComponent implements OnInit {
     this.translate.get(['DESCRIPTION', 'LEVEL', 'TYPE', 'TIME'])
       .subscribe(translations => this.initTableModel(translations));
     this.initFilters();
+    this.getEvents({ reload: true });
 
     this.languageService.getFirstDayOfWeek()
       .subscribe(day => this.firstDayOfWeek = day);
@@ -148,7 +149,6 @@ export class EventListComponent implements OnInit {
     this.selectedLevels = params['levels'];
     this.selectedTypes = params['types'];
     this.query = params['query'];
-    this.getEvents();
   }
 
   private setDateTimeFormat(): void {

src/app/shared/components/date-picker/calendar-month.component.html

@@ -3,6 +3,7 @@
     <div
       class="day"
       [class.none]="!day"
+      [class.today]="isToday(day)"
       *ngFor="let day of week"
       (click)="setSelectedDate($event, day)"
     >

src/app/shared/components/date-picker/calendar-month.component.scss

@@ -36,6 +36,7 @@
   z-index: 1;
   width: 42px;
   background: none;
+  line-height: 25px;
 
   &.none {
     cursor: auto;
@@ -51,6 +52,13 @@
       color: white;
     }
   }
+
+  &.today {
+    .button-state {
+      transform: scale(1);
+      opacity: 0.2;
+    }
+  }
 }
 
 .label {
@@ -84,3 +92,8 @@
     color: white;
   }
 }
+
+.today {
+  font-weight: bold;
+  //font-size: 15px;
+}

src/app/shared/components/date-picker/calendar-month.component.ts

@@ -39,6 +39,10 @@ export class CalendarMonthComponent {
     return isEqualDate(this.selectedDate, date);
   }
 
+  public isToday(date): boolean {
+    return isEqualDate(date, new Date());
+  }
+
   public setSelectedDate(_e: Event, day: Date): void {
     if (!day) {
       return;

src/app/shared/components/date-picker/date-picker.component.ts

@@ -1,14 +1,17 @@
 import {
   Component,
+  EventEmitter,
   forwardRef,
   Input,
-  AfterViewInit
+  OnChanges,
+  Output,
+  SimpleChanges
 } from '@angular/core';
-import { NG_VALUE_ACCESSOR, ControlValueAccessor } from '@angular/forms';
+import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
+import { DialogService } from '../../../dialog/dialog-module/dialog.service';
 
 import { DatePickerDialogComponent } from './date-picker-dialog.component';
 import { dateTimeFormat as DateTimeFormat, formatIso } from './dateUtils';
-import { DialogService } from '../../../dialog/dialog-module/dialog.service';
 
 
 interface DatePickerConfig {
@@ -32,12 +35,13 @@ interface DatePickerConfig {
     }
   ]
 })
-export class DatePickerComponent implements ControlValueAccessor, AfterViewInit {
+export class DatePickerComponent implements ControlValueAccessor, OnChanges {
   @Input() public okLabel = 'Ok';
   @Input() public cancelLabel = 'Cancel';
   @Input() public firstDayOfWeek = 1;
   @Input() public DateTimeFormat = DateTimeFormat;
   @Input() public locale = 'en';
+  @Output() public change = new EventEmitter();
 
   public displayDate: string;
 
@@ -46,8 +50,11 @@ export class DatePickerComponent implements ControlValueAccessor, AfterViewInit
 
   constructor(private dialogService: DialogService) {}
 
-  public ngAfterViewInit(): void {
-    this.date = new Date();
+  public ngOnChanges(changes: SimpleChanges): void {
+    const DateTimeFormatChange = changes['DateTimeFormat'];
+    if (DateTimeFormatChange) {
+      this.displayDate = this._formatDate();
+    }
   }
 
   public propagateChange: any = () => {};
@@ -59,7 +66,6 @@ export class DatePickerComponent implements ControlValueAccessor, AfterViewInit
 
   public set date(newDate) {
     this._date = newDate;
-
     this.displayDate = this._formatDate();
 
     this.propagateChange(this.date);
@@ -106,6 +112,7 @@ export class DatePickerComponent implements ControlValueAccessor, AfterViewInit
         this.isDialogOpen = false;
         if (date) {
           this.date = date;
+          this.change.emit();
         }
       });
   }