inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-31 17:38:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use an external formGroup instead of a new form in the dateRange component

Browse Source
This commit is contained in:
mauriziovitale84
2016-10-10 10:07:27 +01:00
parent ec66cdff89
commit d5f37f3e5c
4 changed files with 78 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
ng2-components/ng2-activiti-analytics/src/components/widgets/date-range/date-range.widget.ts
View File

@@ -16,7 +16,7 @@
*/
import { Component, Input, Output, EventEmitter, ViewChild, ElementRef } from '@angular/core';
import { AbstractControl, FormGroup, FormBuilder, Validators } from '@angular/forms';
import { AbstractControl, FormGroup, FormBuilder } from '@angular/forms';
import { WidgetComponent } from './../widget.component';
import * as moment from 'moment';
@@ -45,13 +45,16 @@ export class DateRangeWidget extends WidgetComponent {
@ViewChild('endElement')
endElement: any;
@Input('group')
public dateRange: FormGroup;
@Input()
field: any;
@Output()
dateRangeChanged: EventEmitter<any> = new EventEmitter<any>();
dataForm: FormGroup;
debug: boolean = true;
dialogStart: any = new mdDateTimePicker.default({
type: 'date',
@@ -63,8 +66,6 @@ export class DateRangeWidget extends WidgetComponent {
future: moment().add(21, 'years')
});
debug: boolean = false;
constructor(public elementRef: ElementRef,
private formBuilder: FormBuilder) {
super();
@@ -77,15 +78,8 @@ export class DateRangeWidget extends WidgetComponent {
}
initForm() {
let today = moment().format(DateRangeWidget.FORMAT_DATE_ACTIVITI);
this.dataForm = this.formBuilder.group({
dateRange: this.formBuilder.group({
startDate: [today, Validators.required],
endDate: [today, Validators.required]
}, {validator: dateCheck})
});
this.dataForm.valueChanges.subscribe(data => this.onValueChanged(data));
this.dataForm.controls['dateRange'].valueChanges.subscribe(data => this.onGroupValueChanged(data));
this.dateRange.setValidators(dateCheck);
this.dateRange.valueChanges.subscribe(data => this.onGroupValueChanged(data));
}
initSartDateDialog() {
@@ -108,8 +102,7 @@ export class DateRangeWidget extends WidgetComponent {
onOkStart(inputEl: HTMLInputElement) {
let date = this.dialogStart.time.format(DateRangeWidget.FORMAT_DATE_ACTIVITI);
let dateRange: any = this.dataForm.controls['dateRange'];
dateRange.patchValue({
this.dateRange.patchValue({
startDate: date
});
let materialElemen: any = inputEl.parentElement;
@@ -120,8 +113,7 @@ export class DateRangeWidget extends WidgetComponent {
onOkEnd(inputEl: HTMLInputElement) {
let date = this.dialogEnd.time.format(DateRangeWidget.FORMAT_DATE_ACTIVITI);
let dateRange: any = this.dataForm.controls['dateRange'];
dateRange.patchValue({
this.dateRange.patchValue({
endDate: date
});
@@ -132,19 +124,9 @@ export class DateRangeWidget extends WidgetComponent {
}
onGroupValueChanged(data: any) {
if (this.dataForm.controls['dateRange'].valid) {
let dateRange: any = this.dataForm.controls['dateRange'];
let dateStart = this.convertMomentDate(dateRange.controls['startDate'].value);
// let endStart = this.convertMomentDate(this.dataForm.controls['endDate'].value);
console.log(dateStart);
}
}
onValueChanged(data: any) {
if (this.dataForm.valid) {
let dateRange: any = this.dataForm.controls['dateRange'];
let dateStart = this.convertMomentDate(dateRange.controls['startDate'].value);
let endStart = this.convertMomentDate(dateRange.controls['endDate'].value);
if (this.dateRange.valid) {
let dateStart = this.convertMomentDate(this.dateRange.controls['startDate'].value);
let endStart = this.convertMomentDate(this.dateRange.controls['endDate'].value);
this.dateRangeChanged.emit({startDate: dateStart, endDate: endStart});
}
}
@@ -152,5 +134,4 @@ export class DateRangeWidget extends WidgetComponent {
public convertMomentDate(date: string) {
return moment(date, DateRangeWidget.FORMAT_DATE_ACTIVITI, true).format(DateRangeWidget.FORMAT_DATE_ACTIVITI) + 'T00:00:00.000Z';
}
}