fixing issue #355 (#356)

Author: vlio20

src/app/common/services/utils/utils.service.spec.ts

@@ -2,6 +2,7 @@ import {inject, TestBed} from '@angular/core/testing';
 import {UtilsService} from './utils.service';
 import * as momentNs from 'moment';
 import {IDate} from '../../models/date.model';
+
 const moment = momentNs;
 
 describe('Service: ObUtilsService', () => {
@@ -116,4 +117,16 @@ describe('Service: ObUtilsService', () => {
     expect(service.datesStringToStringArray('14,01-1984| asdasd'))
       .toEqual(['14,01-1984', 'asdasd']);
   }));
+
+  it('check convertToString', inject([UtilsService], (service: UtilsService) => {
+    const format = 'MM/DD/YYYY';
+    expect(service.convertToString(null, format)).toEqual('');
+    expect(service.convertToString('', format)).toEqual('');
+    expect(service.convertToString(moment(), format)).toEqual(moment().format(format));
+    expect(service.convertToString([moment()], format)).toEqual(moment().format(format));
+    expect(service.convertToString([moment(), moment().add(1, 'd')], format))
+      .toEqual(moment().format(format) + ' | ' + moment().add(1, 'd').format(format));
+    expect(service.convertToString([moment().format(format), moment().add(1, 'd').format(format)], format))
+      .toEqual(moment().format(format) + ' | ' + moment().add(1, 'd').format(format));
+  }));
 });

src/app/common/services/utils/utils.service.ts

@@ -8,6 +8,7 @@ import {IDate} from '../../models/date.model';
 import {CalendarMode} from '../../types/calendar-mode';
 import {DateValidator} from '../../types/validator.type';
 import {ICalendarInternal} from '../../models/calendar.model';
+
 const moment = momentNs;
 
 export interface DateLimits {
@@ -127,6 +128,28 @@ export class UtilsService {
     }
   }
 
+  convertToString(value: CalendarValue, format: string): string {
+    let tmpVal: string[];
+
+    if (typeof value === 'string') {
+      tmpVal = [value];
+    } else if (Array.isArray(value)) {
+      if (value.length) {
+        tmpVal = (<SingleCalendarValue[]>value).map((v) => {
+          return this.convertToMoment(v, format).format(format);
+        });
+      } else {
+        tmpVal = <string[]>value;
+      }
+    } else if (moment.isMoment(value)) {
+      tmpVal = [value.format(format)];
+    } else {
+      return '';
+    }
+
+    return tmpVal.filter(Boolean).join(' | ');
+  }
+
   // todo:: add unit test
   clearUndefined<T>(obj: T): T {
     if (!obj) {

src/app/date-picker/date-picker.directive.spec.ts

@@ -17,7 +17,7 @@ describe('Directive: DpDayPicker', () => {
     });
   });
 
-  const directive = new DatePickerDirective(null, null, null, null, null);
+  const directive = new DatePickerDirective(null, null, null, null, null, null);
 
   it('should create an instance', () => {
     expect(directive).toBeTruthy();

src/app/date-picker/date-picker.directive.ts

@@ -19,6 +19,8 @@ import {NgControl} from '@angular/forms';
 import {CalendarValue} from '../common/types/calendar-value';
 import {SingleCalendarValue} from '../common/types/single-calendar-value';
 import {INavEvent} from '../common/models/navigation-event.model';
+import {UtilsService} from '../common/services/utils/utils.service';
+import {ECalendarValue} from '../common/types/calendar-value-enum';
 
 @Directive({
   exportAs: 'dpDayPicker',
@@ -164,7 +166,8 @@ export class DatePickerDirective implements OnInit {
               public elemRef: ElementRef,
               public componentFactoryResolver: ComponentFactoryResolver,
               public service: DatePickerDirectiveService,
-              @Optional() public formControl: NgControl) {
+              @Optional() public formControl: NgControl,
+              public utilsService: UtilsService) {
   }
 
   ngOnInit(): void {
@@ -189,7 +192,8 @@ export class DatePickerDirective implements OnInit {
 
     this.formControl.valueChanges.subscribe((value) => {
       if (value !== this.datePicker.inputElementValue) {
-        this.datePicker.onViewDateChange(value);
+        const strVal = this.utilsService.convertToString(value, this.datePicker.componentConfig.format);
+        this.datePicker.onViewDateChange(strVal);
       }
     });
 

tsconfig.json

@@ -17,9 +17,6 @@
       "dom"
     ]
   },
-  "include": [
-    "prebuild/app/index.ts"
-  ],
   "exclude": [
     "node_modules",
     "**/*.spec.ts"