diff --git a/.vscode/settings.json b/.vscode/settings.json index 30d10b67e5..277ffe4f6d 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -7,7 +7,8 @@ "**/.DS_Store": true, "**/*.js": { "when": "$(basename).ts"}, "**/*.js.map": { "when": "$(basename)"}, - "**/*.d.ts": { "when": "$(basename).ts"} + "**/*.d.ts": { "when": "$(basename).ts"}, + "**/coverage": true }, "editor.renderIndentGuides": true } diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts b/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts index f20ee6c257..e76f06b659 100644 --- a/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts +++ b/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts @@ -117,7 +117,7 @@ export class ActivitiStartForm extends ActivitiForm implements AfterViewChecked, this.form = this.parseForm(form); this.form.readOnly = this.readOnlyForm; // this.form.processDefinitionId = this.processDefinitionId; - this.formLoaded.emit(this.form); + this.onFormLoaded(this.form); }, error => this.handleError(error) ); @@ -131,7 +131,7 @@ export class ActivitiStartForm extends ActivitiForm implements AfterViewChecked, this.formName = form.processDefinitionName; this.form = this.parseForm(form); this.form.readOnly = this.readOnlyForm; - this.formLoaded.emit(this.form); + this.onFormLoaded(this.form); }, error => this.handleError(error) ); diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/amount/amount.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/amount/amount.widget.html index 985153bc81..6a62e11ceb 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/amount/amount.widget.html +++ b/ng2-components/ng2-activiti-form/src/components/widgets/amount/amount.widget.html @@ -5,6 +5,7 @@ type="text" [attr.id]="field.id" [attr.required]="isRequired()" + [value]="field.value" [(ngModel)]="field.value" (ngModelChange)="checkVisibility(field)" [disabled]="field.readOnly" diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/date/date.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/date/date.widget.html index ef2151b0ee..781b956ccf 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/date/date.widget.html +++ b/ng2-components/ng2-activiti-form/src/components/widgets/date/date.widget.html @@ -7,6 +7,7 @@ type="text" [attr.id]="field.id" [attr.required]="isRequired()" + [value]="field.value" [(ngModel)]="field.value" (ngModelChange)="onDateChanged()" (onOk)="onDateSelected()" diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/multiline-text/multiline-text.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/multiline-text/multiline-text.widget.html index 377581e484..b591a27a79 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/multiline-text/multiline-text.widget.html +++ b/ng2-components/ng2-activiti-form/src/components/widgets/multiline-text/multiline-text.widget.html @@ -6,6 +6,7 @@ rows= "3" [attr.id]="field.id" [attr.required]="isRequired()" + [value]="field.value" [(ngModel)]="field.value" (ngModelChange)="checkVisibility(field)" [disabled]="field.readOnly" diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/number/number.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/number/number.widget.html index ffe0f265b4..d97bf9dc3e 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/number/number.widget.html +++ b/ng2-components/ng2-activiti-form/src/components/widgets/number/number.widget.html @@ -6,6 +6,7 @@ pattern="-?[0-9]*(\.[0-9]+)?" [attr.id]="field.id" [attr.required]="isRequired()" + [value]="field.value" [(ngModel)]="field.value" (ngModelChange)="checkVisibility(field)" [disabled]="field.readOnly" diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/text/text.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/text/text.widget.html index ac2507c5d2..608227cba4 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/text/text.widget.html +++ b/ng2-components/ng2-activiti-form/src/components/widgets/text/text.widget.html @@ -5,6 +5,7 @@ type="text" [attr.id]="field.id" [attr.required]="isRequired()" + [value]="field.value" [(ngModel)]="field.value" (ngModelChange)="onFieldChanged(field)" [disabled]="field.readOnly"