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

Fix typeFiltering parameter

Browse Source
This commit is contained in:
mauriziovitale84
2016-10-25 18:03:28 +01:00
parent 5059436551
commit d58b2f4837
4 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.html
View File

@@ -16,7 +16,8 @@
</div> </div>
<div *ngSwitchCase="'boolean'"> <div *ngSwitchCase="'boolean'">
<br> <br>
<checkbox-widget [field]="field"></checkbox-widget> <checkbox-widget [field]="field" [group]="reportForm.controls.typeFilteringGroup"
[controllerName]="'typeFiltering'"></checkbox-widget>
</div> </div>
<div *ngSwitchCase="'status'"> <div *ngSwitchCase="'status'">
<br> <br>

4
ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.ts
View File

@@ -115,6 +115,9 @@ export class AnalyticsReportParametersComponent implements OnInit, OnChanges {
taskGroup: new FormGroup({ taskGroup: new FormGroup({
taskName: new FormControl() taskName: new FormControl()
}), }),
typeFilteringGroup: new FormGroup({
typeFiltering: new FormControl()
}),
dateIntervalGroup: new FormGroup({ dateIntervalGroup: new FormGroup({
dateRangeInterval: new FormControl() dateRangeInterval: new FormControl()
}), }),
@@ -192,6 +195,7 @@ export class AnalyticsReportParametersComponent implements OnInit, OnChanges {
reportParamQuery.duration = values.durationGroup.duration; reportParamQuery.duration = values.durationGroup.duration;
reportParamQuery.dateRangeInterval = values.dateIntervalGroup.dateRangeInterval; reportParamQuery.dateRangeInterval = values.dateIntervalGroup.dateRangeInterval;
reportParamQuery.slowProcessInstanceInteger = this.convertNumber(values.processInstanceGroup.slowProcessInstanceInteger); reportParamQuery.slowProcessInstanceInteger = this.convertNumber(values.processInstanceGroup.slowProcessInstanceInteger);
reportParamQuery.typeFiltering = values.typeFilteringGroup.typeFiltering;
return reportParamQuery; return reportParamQuery;
} }

4
ng2-components/ng2-activiti-analytics/src/components/widgets/checkbox/checkbox.widget.html
View File

@@ -1,5 +1,5 @@
<label class="mdl-checkbox mdl-js-checkbox mdl-js-ripple-effect" [attr.for]="field.id"> <label class="mdl-checkbox mdl-js-checkbox mdl-js-ripple-effect" [attr.for]="field.id" [formGroup]="formGroup">
<input type="checkbox" <input formControlName="{{controllerName}}" type="checkbox"
[attr.id]="field.id" [attr.id]="field.id"
class="mdl-checkbox__input" class="mdl-checkbox__input"
[checked]="field.value" [checked]="field.value"

15
ng2-components/ng2-activiti-analytics/src/components/widgets/checkbox/checkbox.widget.ts
View File

@@ -15,8 +15,9 @@
* limitations under the License. * limitations under the License.
*/ */
import { Component } from '@angular/core'; import { Component, ElementRef, Input } from '@angular/core';
import { WidgetComponent } from './../widget.component'; import { WidgetComponent } from './../widget.component';
import { FormGroup } from '@angular/forms';
@Component({ @Component({
moduleId: module.id, moduleId: module.id,
@@ -25,8 +26,16 @@ import { WidgetComponent } from './../widget.component';
}) })
export class CheckboxWidget extends WidgetComponent { export class CheckboxWidget extends WidgetComponent {
constructor() { @Input()
field: any;
@Input('group')
public formGroup: FormGroup;
@Input('controllerName')
public controllerName: string;
constructor(public elementRef: ElementRef) {
super(); super();
} }
} }