BP 778: fixed tests
diff --git a/src/app/masterdata-management/components/calendar/calendar.component.html b/src/app/masterdata-management/components/calendar/calendar.component.html
index ddfa4c2..a75741c 100644
--- a/src/app/masterdata-management/components/calendar/calendar.component.html
+++ b/src/app/masterdata-management/components/calendar/calendar.component.html
@@ -39,20 +39,20 @@
<div class="form-group">
<div class="input-group" formGroupName="date">
<input class="form-control" placeholder="Datum" name="dp" ngbDatepicker #date="ngbDatepicker"
- formControlName="date" id="dateInput" required>
+ formControlName="dateIndex" id="dateInput" required>
<div class="input-group-append">
<button class="btn btn-outline-secondary" (click)="date.toggle()" type="button" id="datePicker">
<i class="fa fa-calendar" aria-hidden="true"></i>
</button>
</div>
<div class="input-group-append">
- <button class="btn btn-outline-secondary" (click)="setDefaultDate('date')" type="button" id="dateDefault"
+ <button class="btn btn-outline-secondary" (click)="setDefaultDate('dateIndex')" type="button" id="dateDefault"
data-toggle="tooltip" data-placement="bottom" title="Auf Standardwert setzen">
<i class="fa fa-clock-o" aria-hidden="true"></i>
</button>
</div>
</div>
- <ok-error [control]="form.controls['date'].controls['date']"></ok-error>
+ <ok-error [control]="form.controls['date'].controls['dateIndex']"></ok-error>
</div>
</div>
</div>
diff --git a/src/app/masterdata-management/components/calendar/calendar.component.spec.ts b/src/app/masterdata-management/components/calendar/calendar.component.spec.ts
index 6c57540..8be9a9c 100644
--- a/src/app/masterdata-management/components/calendar/calendar.component.spec.ts
+++ b/src/app/masterdata-management/components/calendar/calendar.component.spec.ts
@@ -91,7 +91,7 @@
});
it('should save the form if there are no validation errors', () => {
- component.form.patchValue({ id: 1, name: 'test', date: { day: 1, month: 1, year: 2018 } });
+ component.form.patchValue({ id: 1, name: 'test', date: { dateIndex: { day: 1, month: 1, year: 2018 } } });
expect(component.saveDate()).toBeTruthy();
});
});
@@ -99,8 +99,8 @@
describe('setDefaultDate', () => {
it('should set date to current day', () => {
const date = new Date();
- component.setDefaultDate('date');
- expect(component.form.controls.date.value).toEqual({
+ component.setDefaultDate('dateIndex');
+ expect(component.form.get('date').get('dateIndex').value).toEqual({
day: date.getDate(), month: date.getMonth() + 1, year: date.getFullYear()
});
});
diff --git a/src/app/masterdata-management/components/calendar/calendar.component.ts b/src/app/masterdata-management/components/calendar/calendar.component.ts
index a48f7f2..173e202 100644
--- a/src/app/masterdata-management/components/calendar/calendar.component.ts
+++ b/src/app/masterdata-management/components/calendar/calendar.component.ts
@@ -43,7 +43,9 @@
if (this.instanceId && this.instanceId !== 'new') {
this.date$ = this.masterDataService.getDate(this.instanceId).subscribe(
data => {
- data.date = this.ngbDateParserFormatter.parse(data.date);
+ data.date = {
+ dateIndex: this.ngbDateParserFormatter.parse(data.dateIndex)
+ };
this.form.patchValue(data);
}
);
@@ -56,7 +58,7 @@
id: '',
name: ['', Validators.required],
date: this.fb.group({
- date: ['', Validators.required]
+ dateIndex: ['', Validators.required]
})
});
}
@@ -70,7 +72,7 @@
saveDate() {
if (FormUtil.validate(this.form)) {
const dateToSave = this.form.getRawValue();
- FormUtil.formatDates(dateToSave, ['date']);
+ FormUtil.formatDates(dateToSave, ['dateIndex']);
this.masterDataService.saveDate(dateToSave).subscribe((res: DateObject) => {
// neccessary due to canDeactivate guard
this.form.markAsPristine();
diff --git a/src/app/masterdata-management/components/calendarlist/calendarlist.component.ts b/src/app/masterdata-management/components/calendarlist/calendarlist.component.ts
index 39014c7..2da4937 100644
--- a/src/app/masterdata-management/components/calendarlist/calendarlist.component.ts
+++ b/src/app/masterdata-management/components/calendarlist/calendarlist.component.ts
@@ -26,7 +26,7 @@
columnDefs = [
{ headerName: 'Name', field: 'name' },
{
- headerName: 'Datum', field: 'date', filter: 'agDateColumnFilter', valueFormatter: ListUtil.formatDate,
+ headerName: 'Datum', field: 'dateIndex', filter: 'agDateColumnFilter', valueFormatter: ListUtil.formatDate,
filterParams: {
comparator: ListUtil.compareDates
}
diff --git a/src/app/masterdata-management/components/user/user.component.spec.ts b/src/app/masterdata-management/components/user/user.component.spec.ts
index d1f8fd0..5c948ac 100644
--- a/src/app/masterdata-management/components/user/user.component.spec.ts
+++ b/src/app/masterdata-management/components/user/user.component.spec.ts
@@ -160,7 +160,7 @@
it('should set validFrom to current day', () => {
const date = new Date();
component.setDefaultDate('validFrom');
- expect(component.form.get('validFrom').value).toEqual({
+ expect(component.form.get('date').get('validFrom').value).toEqual({
day: date.getDate(), month: date.getMonth() + 1, year: date.getFullYear()
});
});
@@ -168,7 +168,7 @@
it('should set validTo to current day + 15 years', () => {
const date = new Date();
component.setDefaultDate('validTo');
- expect(component.form.get('validTo').value).toEqual({
+ expect(component.form.get('date').get('validTo').value).toEqual({
day: date.getDate(), month: date.getMonth() + 1, year: date.getFullYear() + 15
});
});
diff --git a/src/app/masterdata-management/selection-dialogs/validity-dialog/validity-dialog.component.spec.ts b/src/app/masterdata-management/selection-dialogs/validity-dialog/validity-dialog.component.spec.ts
index fb27778..63a0523 100644
--- a/src/app/masterdata-management/selection-dialogs/validity-dialog/validity-dialog.component.spec.ts
+++ b/src/app/masterdata-management/selection-dialogs/validity-dialog/validity-dialog.component.spec.ts
@@ -62,7 +62,7 @@
it('should set validFrom to current day', () => {
const date = new Date();
component.setDefaultDate('validFrom');
- expect(component.form.get('validFrom').value).toEqual({
+ expect(component.form.get('date').get('validFrom').value).toEqual({
day: date.getDate(), month: date.getMonth() + 1, year: date.getFullYear()
});
});
@@ -70,7 +70,7 @@
it('should set validTo to current day + 15 years', () => {
const date = new Date();
component.setDefaultDate('validTo');
- expect(component.form.get('validTo').value).toEqual({
+ expect(component.form.get('date').get('validTo').value).toEqual({
day: date.getDate(), month: date.getMonth() + 1, year: date.getFullYear() + 15
});
});
diff --git a/src/app/reporting/components/dashboard/dashboard.component.spec.ts b/src/app/reporting/components/dashboard/dashboard.component.spec.ts
index efc9518..b39502d 100644
--- a/src/app/reporting/components/dashboard/dashboard.component.spec.ts
+++ b/src/app/reporting/components/dashboard/dashboard.component.spec.ts
@@ -107,7 +107,7 @@
it('should set validFrom to current day', () => {
const date = new Date();
component.setDefaultDate('dateIndex');
- expect(component.form.controls.dateIndex.value).toEqual({
+ expect(component.form.get('date').get('dateIndex').value).toEqual({
day: date.getDate(), month: date.getMonth() + 1, year: date.getFullYear()
});
});
diff --git a/src/app/reporting/components/standby-reporting/standby-reporting.component.spec.ts b/src/app/reporting/components/standby-reporting/standby-reporting.component.spec.ts
index 3395160..3b05727 100644
--- a/src/app/reporting/components/standby-reporting/standby-reporting.component.spec.ts
+++ b/src/app/reporting/components/standby-reporting/standby-reporting.component.spec.ts
@@ -92,7 +92,7 @@
it('should set validFrom to current day', () => {
const date = new Date();
component.setDefaultDate('validFrom');
- expect(component.form.get('validFrom').value).toEqual({
+ expect(component.form.get('date').get('validFrom').value).toEqual({
day: date.getDate(), month: date.getMonth() + 1, year: date.getFullYear()
});
});
@@ -100,7 +100,7 @@
it('should set validTo to current day + 15 years', () => {
const date = new Date();
component.setDefaultDate('validTo');
- expect(component.form.get('validTo').value).toEqual({
+ expect(component.form.get('date').get('validTo').value).toEqual({
day: date.getDate(), month: date.getMonth() + 1, year: date.getFullYear() + 15
});
});
diff --git a/src/app/shared/abstract/abstract-dialog/abstract-dialog.component.spec.ts b/src/app/shared/abstract/abstract-dialog/abstract-dialog.component.spec.ts
index 79dbe41..3340efd 100644
--- a/src/app/shared/abstract/abstract-dialog/abstract-dialog.component.spec.ts
+++ b/src/app/shared/abstract/abstract-dialog/abstract-dialog.component.spec.ts
@@ -37,8 +37,10 @@
describe('test decision method', () => {
it('should validate form fields if decision is true and form fields are invalid', () => {
component.form = new FormGroup({
- validFrom: new FormControl('', Validators.required),
- validTo: new FormControl(''),
+ date: new FormGroup({
+ validFrom: new FormControl('', Validators.required),
+ validTo: new FormControl('')
+ })
});
const dataToTransmit = component.form.getRawValue();
component.decide(true, dataToTransmit);
@@ -46,8 +48,10 @@
});
it('should emit falsy value if decision was false', () => {
component.form = new FormGroup({
- validFrom: new FormControl('test', Validators.required),
- validTo: new FormControl(''),
+ date: new FormGroup({
+ validFrom: new FormControl('test', Validators.required),
+ validTo: new FormControl('')
+ })
});
component.decision.subscribe((res) => {
expect(res).toBeFalsy();
@@ -57,8 +61,10 @@
});
it('should emit dataToTramsit if decision is true and form is valid', () => {
component.form = new FormGroup({
- validFrom: new FormControl('test', Validators.required),
- validTo: new FormControl(''),
+ date: new FormGroup({
+ validFrom: new FormControl('test', Validators.required),
+ validTo: new FormControl('')
+ })
});
component.decision.subscribe((res) => {
expect(res).toBeTruthy();
@@ -69,8 +75,10 @@
});
it('should emit truthy value if decision was true and data is undefined', () => {
component.form = new FormGroup({
- validFrom: new FormControl('test', Validators.required),
- validTo: new FormControl(''),
+ date: new FormGroup({
+ validFrom: new FormControl('test', Validators.required),
+ validTo: new FormControl('')
+ })
});
component.decision.subscribe((res) => {
expect(res).toBeTruthy();
@@ -83,8 +91,10 @@
describe('test addTimeToDates method', () => {
it('should add times to date and result in datestring', () => {
const obj = {
- validFrom: { day: 1, month: 1, year: 2018 },
- validTo: { day: 1, month: 1, year: 2018 },
+ date: {
+ validFrom: { day: 1, month: 1, year: 2018 },
+ validTo: { day: 1, month: 1, year: 2018 },
+ },
validFromTime: { hour: 10, minute: 10 },
validToTime: { hour: 12, minute: 10 },
};
@@ -112,22 +122,26 @@
describe('setDefaultDate', () => {
it('should set validFrom to current day', () => {
component.form = new FormGroup({
- validFrom: new FormControl('')
+ date: new FormGroup({
+ validFrom: new FormControl('')
+ })
});
const date = new Date();
component.setDefaultDate('validFrom');
- expect(component.form.controls.validFrom.value).toEqual({
+ expect(component.form.get('date').get('validFrom').value).toEqual({
day: date.getDate(), month: date.getMonth() + 1, year: date.getFullYear()
});
});
it('should set validTo to current day + 15 years', () => {
component.form = new FormGroup({
- validTo: new FormControl('')
+ date: new FormGroup({
+ validTo: new FormControl('')
+ })
});
const date = new Date();
component.setDefaultDate('validTo');
- expect(component.form.controls.validTo.value).toEqual({
+ expect(component.form.get('date').get('validTo').value).toEqual({
day: date.getDate(), month: date.getMonth() + 1, year: date.getFullYear() + 15
});
});
diff --git a/src/app/shared/model/DateObject.ts b/src/app/shared/model/DateObject.ts
index e4ef4bd..987444a 100644
--- a/src/app/shared/model/DateObject.ts
+++ b/src/app/shared/model/DateObject.ts
@@ -10,5 +10,8 @@
export class DateObject {
id: number;
name: string;
- date: any;
+ date?: {
+ dateIndex: any
+ };
+ dateIndex: any;
}
diff --git a/src/app/shared/testing/standbygroup.ts b/src/app/shared/testing/standbygroup.ts
index fa78894..d0d5dfe 100644
--- a/src/app/shared/testing/standbygroup.ts
+++ b/src/app/shared/testing/standbygroup.ts
@@ -106,12 +106,12 @@
{
id: 1,
name: 'Ostern',
- date: '2018-04-20'
+ dateIndex: '2018-04-20'
},
{
id: 2,
name: 'Neujahr',
- date: '2019-01-01'
+ dateIndex: '2019-01-01'
}
];
diff --git a/src/app/shared/utils/form.util.spec.ts b/src/app/shared/utils/form.util.spec.ts
index e741567..47bae98 100644
--- a/src/app/shared/utils/form.util.spec.ts
+++ b/src/app/shared/utils/form.util.spec.ts
@@ -11,7 +11,7 @@
import { FormControl, Validators, FormGroup, FormArray } from '@angular/forms';
import { FormUtil } from '@shared/utils/form.util';
-describe('PicklistComponent', () => {
+describe('FormUtil', () => {
it('should validatedAllFormFields', () => {
const formGroup: FormGroup = new FormGroup({
functionName: new FormControl('', Validators.required),
@@ -78,60 +78,63 @@
it('should add 5 days to 31.12.2018 and expect 04.01.2019', () => {
const formGroup: FormGroup = new FormGroup({
functionName: new FormControl('', Validators.required),
- validTo: new FormControl('')
+ date: new FormGroup({
+ validTo: new FormControl('')
+ })
});
const date = new Date('2018-12-31');
FormUtil.setInitialDate(formGroup);
FormUtil.setDefaultReportDate(formGroup, 'validTo', 5, date);
- expect(formGroup.controls.validTo.value).toEqual({ day: 5, month: 1, year: 2019 });
+ expect(formGroup.get('date').get('validTo').value).toEqual({ day: 5, month: 1, year: 2019 });
});
it('should patch validFrom and validTo dates to 01.01.20xx and 31.12.20xx', () => {
const formGroup: FormGroup = new FormGroup({
functionName: new FormControl('', Validators.required),
- validFrom: new FormControl(''),
- validTo: new FormControl('')
+ date: new FormGroup({
+ validFrom: new FormControl(''),
+ validTo: new FormControl('')
+ })
});
const date = new Date();
FormUtil.setInitialDate(formGroup);
- expect(formGroup.controls.validFrom.value).toEqual({ day: 1, month: 1, year: date.getFullYear() + 1 });
- expect(formGroup.controls.validTo.value).toEqual({ day: 31, month: 12, year: date.getFullYear() + 1 });
+ expect(formGroup.get('date').get('validFrom').value).toEqual({ day: 1, month: 1, year: date.getFullYear() + 1 });
+ expect(formGroup.get('date').get('validTo').value).toEqual({ day: 31, month: 12, year: date.getFullYear() + 1 });
});
it('should patch validTo date 31.12.20xx', () => {
const formGroup: FormGroup = new FormGroup({
functionName: new FormControl('', Validators.required),
- validFrom: new FormControl(''),
- validTo: new FormControl('')
+ date: new FormGroup({
+ validFrom: new FormControl(''),
+ validTo: new FormControl('')
+ })
});
const date = new Date();
FormUtil.setDefaultEndOfNextYear(formGroup, 'validTo');
- expect(formGroup.controls.validTo.value).toEqual({ day: 31, month: 12, year: date.getFullYear() + 1 });
+ expect(formGroup.get('date').get('validTo').value).toEqual({ day: 31, month: 12, year: date.getFullYear() + 1 });
});
describe('setDefaultDate', () => {
it('should set validFrom and date values to the current date and validTo to current + 15 years', () => {
const formGroup: FormGroup = new FormGroup({
functionName: new FormControl('', Validators.required),
- validFrom: new FormControl(''),
- validTo: new FormControl(''),
- date: new FormControl('')
+ date: new FormGroup({
+ validFrom: new FormControl(''),
+ validTo: new FormControl('')
+ })
});
const date = new Date();
FormUtil.setDefaultDate(formGroup, 'validFrom');
FormUtil.setDefaultDate(formGroup, 'validTo');
- FormUtil.setDefaultDate(formGroup, 'date');
- expect(formGroup.controls.validFrom.value).toEqual({
+ expect(formGroup.get('date').get('validFrom').value).toEqual({
day: date.getDate(), month: date.getMonth() + 1, year: date.getFullYear()
});
- expect(formGroup.controls.validTo.value).toEqual({
+ expect(formGroup.get('date').get('validTo').value).toEqual({
day: date.getDate(), month: date.getMonth() + 1, year: date.getFullYear() + 15
});
- expect(formGroup.controls.date.value).toEqual({
- day: date.getDate(), month: date.getMonth() + 1, year: date.getFullYear()
- });
});
});
diff --git a/src/app/shared/utils/form.util.ts b/src/app/shared/utils/form.util.ts
index fe527b6..7548773 100644
--- a/src/app/shared/utils/form.util.ts
+++ b/src/app/shared/utils/form.util.ts
@@ -65,9 +65,6 @@
if (field === 'validTo') {
date.setFullYear(date.getFullYear() + 15);
}
- console.log(form);
- console.log(field);
- console.log(form.get('date').get(field));
form.get('date').get(field).setValue(ngbDateFormatter.parse(datePipe.transform(date, 'yyyy-MM-dd')));
}
diff --git a/src/app/shared/validators/datepicker.validator.spec.ts b/src/app/shared/validators/datepicker.validator.spec.ts
index f651027..670691c 100644
--- a/src/app/shared/validators/datepicker.validator.spec.ts
+++ b/src/app/shared/validators/datepicker.validator.spec.ts
@@ -16,55 +16,65 @@
const formGroup: FormGroup = new FormGroup({
title: new FormControl(''),
district: new FormControl('test'),
- validFrom: new FormControl(''),
- validTo: new FormControl('', [DatepickerValidator.dateRangeTo('validFrom')])
+ date: new FormGroup({
+ validFrom: new FormControl(''),
+ validTo: new FormControl('')
+ }, [DatepickerValidator.dateRangeTo('validFrom')])
});
FormUtil.validate(formGroup);
- expect(formGroup.controls.validTo.errors).toBe(null);
+ expect(formGroup.get('date').errors).toBe(null);
});
it('should be null if the formcontrols are not empty and from is before to date', () => {
const formGroup: FormGroup = new FormGroup({
title: new FormControl(''),
district: new FormControl('test'),
- validFrom: new FormControl({ day: 10, month: 10, year: 2018 }),
- validTo: new FormControl('', [DatepickerValidator.dateRangeTo('validFrom')])
+ date: new FormGroup({
+ validFrom: new FormControl({ day: 10, month: 10, year: 2018 }),
+ validTo: new FormControl('')
+ }, [DatepickerValidator.dateRangeTo('validFrom')])
});
- formGroup.patchValue({ validTo: { day: 11, month: 10, year: 2018 } });
- expect(formGroup.controls.validTo.errors).toBe(null);
+ formGroup.patchValue({ date: { validTo: { day: 11, month: 10, year: 2018 } } });
+ expect(formGroup.get('date').errors).toBe(null);
});
it('should be null if the formcontrols are not empty and from is equal to to date', () => {
const formGroup: FormGroup = new FormGroup({
title: new FormControl(''),
district: new FormControl('test'),
- validFrom: new FormControl({ day: 10, month: 10, year: 2018 }),
- validTo: new FormControl('', [DatepickerValidator.dateRangeTo('validFrom')])
+ date: new FormGroup({
+ validFrom: new FormControl({ day: 10, month: 10, year: 2018 }),
+ validTo: new FormControl('')
+ }, [DatepickerValidator.dateRangeTo('validFrom')])
});
- formGroup.patchValue({ validTo: { day: 10, month: 10, year: 2018 } });
- expect(formGroup.controls.validTo.errors).toBe(null);
+ formGroup.patchValue({ date: { validTo: { day: 10, month: 10, year: 2018 } } });
+ expect(formGroup.get('date').errors).toBe(null);
});
it('should be truthy if the formcontrols are not empty and to is before from date', () => {
const formGroup: FormGroup = new FormGroup({
title: new FormControl(''),
district: new FormControl('test'),
- validFrom: new FormControl({ day: 2, month: 10, year: 2018 }),
- validTo: new FormControl('', [DatepickerValidator.dateRangeTo('validFrom')])
+ date: new FormGroup({
+ validFrom: new FormControl({ day: 2, month: 10, year: 2018 }),
+ validTo: new FormControl('')
+ }, [DatepickerValidator.dateRangeTo('validFrom')])
});
- formGroup.patchValue({ validTo: { day: 1, month: 10, year: 2018 } });
- expect(formGroup.controls.validTo.errors).toBeTruthy();
+ formGroup.patchValue({ date: { validTo: { day: 1, month: 10, year: 2018 } } });
+ expect(formGroup.get('date').errors).toBeTruthy();
});
it('should be truthy if the user enters another date in from field', () => {
const formGroup: FormGroup = new FormGroup({
title: new FormControl(''),
district: new FormControl('test'),
- validFrom: new FormControl({ day: 2, month: 10, year: 2018 }),
- validTo: new FormControl('', [DatepickerValidator.dateRangeTo('validFrom')])
+ date: new FormGroup({
+ validFrom: new FormControl({ day: 2, month: 10, year: 2018 }),
+ validTo: new FormControl('')
+ }, [DatepickerValidator.dateRangeTo('')])
});
- formGroup.patchValue({ validTo: { day: 10, month: 10, year: 2018 } });
- formGroup.patchValue({ validFrom: { day: 20, month: 10, year: 2018 } });
- expect(formGroup.controls.validTo.errors).toBeTruthy();
+ formGroup.patchValue({ date: { validTo: { day: 10, month: 10, year: 2018 } } });
+ formGroup.patchValue({ date: { validFrom: { day: 20, month: 10, year: 2018 } } });
+ expect(formGroup.get('date').errors).toBeTruthy();
});
});
diff --git a/src/app/standby-schedule/components/archivelist/archivelist.component.spec.ts b/src/app/standby-schedule/components/archivelist/archivelist.component.spec.ts
index f86669d..29bd847 100644
--- a/src/app/standby-schedule/components/archivelist/archivelist.component.spec.ts
+++ b/src/app/standby-schedule/components/archivelist/archivelist.component.spec.ts
@@ -95,7 +95,7 @@
}
});
component.clear();
- expect(component.form.getRawValue().dateIndex).toBe(null);
+ expect(component.form.getRawValue().date.dateIndex).toBe(null);
});
});
});
diff --git a/src/app/standby-schedule/components/planninglist/planninglist.component.spec.ts b/src/app/standby-schedule/components/planninglist/planninglist.component.spec.ts
index ba0e28c..82a0273 100644
--- a/src/app/standby-schedule/components/planninglist/planninglist.component.spec.ts
+++ b/src/app/standby-schedule/components/planninglist/planninglist.component.spec.ts
@@ -125,7 +125,14 @@
statusId: 1
});
component.openCalculationModal(1);
- component.modalCalculationRef.componentInstance.modalAction.next({ action: 'calculate', data: {} });
+ component.modalCalculationRef.componentInstance.modalAction.next({
+ action: 'calculate', data: {
+ date: {
+ validFrom: { day: 1, month: 10, year: 2018 },
+ validTo: { day: 2, month: 10, year: 2018 },
+ }
+ }
+ });
});
it('shouldn´t start a calculation if the action is not "calculate"', () => {
component.form.patchValue({
diff --git a/src/app/standby-schedule/components/planninglist/planninglist.component.ts b/src/app/standby-schedule/components/planninglist/planninglist.component.ts
index 99fd249..2c0c53f 100644
--- a/src/app/standby-schedule/components/planninglist/planninglist.component.ts
+++ b/src/app/standby-schedule/components/planninglist/planninglist.component.ts
@@ -176,8 +176,10 @@
this.modalCalculationRef.componentInstance.form.patchValue({
standbyListId: currentForm.standbyListId,
standbyGroupId: standbyGroupId,
- validFrom: currentForm.date.validFrom,
- validTo: currentForm.date.validTo
+ date: {
+ validFrom: currentForm.date.validFrom,
+ validTo: currentForm.date.validTo
+ }
});
const modalAction: Subscription = this.modalCalculationRef.componentInstance.modalAction.subscribe((res: ModalTransferObject) => {
if (res.action === 'calculate') {
diff --git a/src/app/standby-schedule/dialogs/calculate-dialog/calculate-dialog.component.spec.ts b/src/app/standby-schedule/dialogs/calculate-dialog/calculate-dialog.component.spec.ts
index 22a6dd7..de44143 100644
--- a/src/app/standby-schedule/dialogs/calculate-dialog/calculate-dialog.component.spec.ts
+++ b/src/app/standby-schedule/dialogs/calculate-dialog/calculate-dialog.component.spec.ts
@@ -61,7 +61,7 @@
it('should set validFrom to current day', () => {
const date = new Date();
component.setDefaultDate('validFrom');
- expect(component.form.get('validFrom').value).toEqual({
+ expect(component.form.get('date').get('validFrom').value).toEqual({
day: date.getDate(), month: date.getMonth() + 1, year: date.getFullYear()
});
});
@@ -69,7 +69,7 @@
it('should set validTo to current day + 15 years', () => {
const date = new Date();
component.setDefaultDate('validTo');
- expect(component.form.get('validTo').value).toEqual({
+ expect(component.form.get('date').get('validTo').value).toEqual({
day: date.getDate(), month: date.getMonth() + 1, year: date.getFullYear() + 15
});
});
diff --git a/src/app/standby-schedule/dialogs/move-dialog/move-dialog.component.spec.ts b/src/app/standby-schedule/dialogs/move-dialog/move-dialog.component.spec.ts
index b167206..26e6c4d 100644
--- a/src/app/standby-schedule/dialogs/move-dialog/move-dialog.component.spec.ts
+++ b/src/app/standby-schedule/dialogs/move-dialog/move-dialog.component.spec.ts
@@ -69,7 +69,7 @@
it('should set validFrom to current day', () => {
const date = new Date();
component.setDefaultDate('validFrom');
- expect(component.form.get('validFrom').value).toEqual({
+ expect(component.form.get('date').get('validFrom').value).toEqual({
day: date.getDate(), month: date.getMonth() + 1, year: date.getFullYear()
});
});
@@ -77,7 +77,7 @@
it('should set validTo to current day + 15 years', () => {
const date = new Date();
component.setDefaultDate('validTo');
- expect(component.form.get('validTo').value).toEqual({
+ expect(component.form.get('date').get('validTo').value).toEqual({
day: date.getDate(), month: date.getMonth() + 1, year: date.getFullYear() + 15
});
});
diff --git a/src/app/standby-schedule/dialogs/replace-dialog/replace-dialog.component.spec.ts b/src/app/standby-schedule/dialogs/replace-dialog/replace-dialog.component.spec.ts
index bebe9ef..e964d27 100644
--- a/src/app/standby-schedule/dialogs/replace-dialog/replace-dialog.component.spec.ts
+++ b/src/app/standby-schedule/dialogs/replace-dialog/replace-dialog.component.spec.ts
@@ -86,7 +86,7 @@
it('should set validFrom to current day', () => {
const date = new Date();
component.setDefaultDate('validFrom');
- expect(component.form.get('validFrom').value).toEqual({
+ expect(component.form.get('date').get('validFrom').value).toEqual({
day: date.getDate(), month: date.getMonth() + 1, year: date.getFullYear()
});
});
@@ -94,7 +94,7 @@
it('should set validTo to current day + 15 years', () => {
const date = new Date();
component.setDefaultDate('validTo');
- expect(component.form.get('validTo').value).toEqual({
+ expect(component.form.get('date').get('validTo').value).toEqual({
day: date.getDate(), month: date.getMonth() + 1, year: date.getFullYear() + 15
});
});
diff --git a/src/app/standby-schedule/dialogs/transfer-dialog/transfer-dialog.component.spec.ts b/src/app/standby-schedule/dialogs/transfer-dialog/transfer-dialog.component.spec.ts
index 824a6a3..a0990e3 100644
--- a/src/app/standby-schedule/dialogs/transfer-dialog/transfer-dialog.component.spec.ts
+++ b/src/app/standby-schedule/dialogs/transfer-dialog/transfer-dialog.component.spec.ts
@@ -68,7 +68,7 @@
it('should set validFrom to current day', () => {
const date = new Date();
component.setDefaultDate('validFrom');
- expect(component.form.get('validFrom').value).toEqual({
+ expect(component.form.get('date').get('validFrom').value).toEqual({
day: date.getDate(), month: date.getMonth() + 1, year: date.getFullYear()
});
});
@@ -76,7 +76,7 @@
it('should set validTo to current day + 15 years', () => {
const date = new Date();
component.setDefaultDate('validTo');
- expect(component.form.get('validTo').value).toEqual({
+ expect(component.form.get('date').get('validTo').value).toEqual({
day: date.getDate(), month: date.getMonth() + 1, year: date.getFullYear() + 15
});
});
