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

#1219 Default range date

Browse Source
This commit is contained in:
mauriziovitale84
2016-12-13 18:09:57 +00:00
parent 562fa9ec7c
commit 29b8b635fa
2 changed files with 43 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,15 +54,9 @@ export class DateRangeWidget extends WidgetComponent {
debug: boolean = false;
dialogStart: any = new mdDateTimePicker.default({
type: 'date',
future: moment().add(21, 'years')
});
dialogStart: any;
dialogEnd: any = new mdDateTimePicker.default({
type: 'date',
future: moment().add(21, 'years')
});
dialogEnd: any;
constructor(public elementRef: ElementRef,
private formBuilder: FormBuilder) {
@@ -72,26 +66,39 @@ export class DateRangeWidget extends WidgetComponent {
ngOnInit() {
this.initForm();
this.addAccessibilityLabelToDatePicker();
this.initSartDateDialog();
this.initEndDateDialog();
}
initForm() {
let today = moment().format('YYYY-MM-DD');
let startDateForm = this.field.value ? this.field.value.startDate : '' ;
let startDate = this.convertToMomentDate(startDateForm);
let endDateForm = this.field.value ? this.field.value.endDate : '' ;
let endDate = this.convertToMomentDate(endDateForm);
let startDateControl = new FormControl(today);
let startDateControl = new FormControl(startDate);
startDateControl.setValidators(Validators.required);
this.dateRange.addControl('startDate', startDateControl);
let endDateControl = new FormControl(today);
let endDateControl = new FormControl(endDate);
endDateControl.setValidators(Validators.required);
this.dateRange.addControl('endDate', endDateControl);
this.dateRange.setValidators(dateCheck);
this.dateRange.valueChanges.subscribe(data => this.onGroupValueChanged(data));
this.initSartDateDialog(startDate);
this.initEndDateDialog(endDate);
}
initSartDateDialog() {
initSartDateDialog(date: string) {
let settings: any = {
type: 'date',
past: moment().subtract(100, 'years'),
future: moment().add(100, 'years')
};
settings.init = moment(date, DateRangeWidget.FORMAT_DATE_ACTIVITI);
this.dialogStart = new mdDateTimePicker.default(settings);
this.dialogStart.trigger = this.startElement.nativeElement;
let startDateButton = document.getElementById('startDateButton');
@@ -130,7 +137,16 @@ export class DateRangeWidget extends WidgetComponent {
return span;
}
initEndDateDialog() {
initEndDateDialog(date: string) {
let settings: any = {
type: 'date',
past: moment().subtract(100, 'years'),
future: moment().add(100, 'years')
};
settings.init = moment(date, DateRangeWidget.FORMAT_DATE_ACTIVITI);
this.dialogEnd = new mdDateTimePicker.default(settings);
this.dialogEnd.trigger = this.endElement.nativeElement;
let endDateButton = document.getElementById('endDateButton');
@@ -164,16 +180,24 @@ export class DateRangeWidget extends WidgetComponent {
onGroupValueChanged(data: any) {
if (this.dateRange.valid) {
let dateStart = this.convertMomentDate(this.dateRange.controls['startDate'].value);
let endStart = this.convertMomentDate(this.dateRange.controls['endDate'].value);
let dateStart = this.convertToMomentDateWithTime(this.dateRange.controls['startDate'].value);
let endStart = this.convertToMomentDateWithTime(this.dateRange.controls['endDate'].value);
this.dateRangeChanged.emit({startDate: dateStart, endDate: endStart});
}
}
public convertMomentDate(date: string) {
public convertToMomentDateWithTime(date: string) {
return moment(date, DateRangeWidget.FORMAT_DATE_ACTIVITI, true).format(DateRangeWidget.FORMAT_DATE_ACTIVITI) + 'T00:00:00.000Z';
}
private convertToMomentDate(date: string) {
if (date) {
return moment(date).format(DateRangeWidget.FORMAT_DATE_ACTIVITI);
} else {
return moment().format(DateRangeWidget.FORMAT_DATE_ACTIVITI);
}
}
ngOnDestroy() {
}

2
ng2-components/ng2-activiti-analytics/src/models/report.model.ts
View File

@@ -72,7 +72,7 @@ export class ReportParameterDetailsModel {
name: string;
nameKey: string;
type: string;
value: string;
value: any;
options: ParameterValueModel[];
dependsOn: string;