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

#1031 - Check the value of old forms in process variables

Browse Source
This commit is contained in:
Vito Albano
2016-12-16 13:08:38 +00:00
parent c6c5a39a85
commit 12c4de2c1e
7 changed files with 22 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts
View File

@@ -280,7 +280,7 @@ export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges {
loadForm() {
if (this.taskId) {
this.getFormByTaskId(this.taskId);
this.visibilityService.getTaskProcessVariable(this.taskId);
this.visibilityService.getTaskProcessVariable(this.taskId).subscribe();
return;
}

2
ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.spec.ts
View File

@@ -38,7 +38,7 @@ describe('DisplayValueWidget', () => {
beforeEach(() => {
settingsService = new AlfrescoSettingsService();
formService = new FormService(null, null);
visibilityService = new WidgetVisibilityService(null, null, null);
visibilityService = new WidgetVisibilityService(null);
widget = new DisplayValueWidget(formService, visibilityService, settingsService);
});

2
ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.spec.ts
View File

@@ -34,7 +34,7 @@ describe('DropdownWidget', () => {
beforeEach(() => {
formService = new FormService(null, null);
visibilityService = new WidgetVisibilityService(null, null, null);
visibilityService = new WidgetVisibilityService(null);
widget = new DropdownWidget(formService, visibilityService);
widget.field = new FormFieldModel(new FormModel());
});

2
ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/dynamic-table.widget.spec.ts
View File

@@ -28,7 +28,7 @@ describe('DynamicTableWidget', () => {
beforeEach(() => {
table = new DynamicTableModel(null);
visibilityService = new WidgetVisibilityService(null, null, null);
visibilityService = new WidgetVisibilityService(null);
widget = new DynamicTableWidget(null, visibilityService);
widget.content = table;
});

2
ng2-components/ng2-activiti-form/src/components/widgets/radio-buttons/radio-buttons.widget.spec.ts
View File

@@ -36,7 +36,7 @@ describe('RadioButtonsWidget', () => {
beforeEach(() => {
formService = new FormService(null, null);
visibilityService = new WidgetVisibilityService(null, null, null);
visibilityService = new WidgetVisibilityService(null);
widget = new RadioButtonsWidget(formService, visibilityService);
widget.field = new FormFieldModel(new FormModel(), { restUrl: '<url>' });
});

2
ng2-components/ng2-activiti-form/src/components/widgets/typeahead/typeahead.widget.spec.ts
View File

@@ -35,7 +35,7 @@ describe('TypeaheadWidget', () => {
beforeEach(() => {
formService = new FormService(null, null);
visibilityService = new WidgetVisibilityService(null, null, null);
visibilityService = new WidgetVisibilityService(null);
widget = new TypeaheadWidget(formService, visibilityService);
widget.field = new FormFieldModel(new FormModel({ taskId: 'task-id' }));
});

43
ng2-components/ng2-activiti-form/src/services/widget-visibility.service.ts
View File

@@ -16,9 +16,8 @@
*/
import { Injectable } from '@angular/core';
import { Response, Http, Headers, RequestOptions } from '@angular/http';
import { Observable } from 'rxjs/Rx';
import { AlfrescoSettingsService, AlfrescoAuthenticationService } from 'ng2-alfresco-core';
import { AlfrescoApiService } from 'ng2-alfresco-core';
import {
FormModel,
FormFieldModel,
@@ -35,9 +34,7 @@ export class WidgetVisibilityService {
private processVarList: TaskProcessVariableModel[];
constructor(private http: Http,
private alfrescoSettingsService: AlfrescoSettingsService,
private authService: AlfrescoAuthenticationService) {
constructor(private apiService: AlfrescoApiService) {
}
public refreshVisibility(form: FormModel) {
@@ -80,10 +77,14 @@ export class WidgetVisibilityService {
}
getLeftValue(form: FormModel, visibilityObj: WidgetVisibilityModel) {
let leftValue = '';
if (visibilityObj.leftRestResponseId && visibilityObj.leftRestResponseId !== 'null') {
return this.getVariableValue(form, visibilityObj.leftRestResponseId, this.processVarList);
leftValue = this.getVariableValue(form, visibilityObj.leftRestResponseId, this.processVarList);
} else {
leftValue = this.getFormValue(form, visibilityObj.leftFormFieldId);
leftValue = leftValue ? leftValue : this.getVariableValue(form, visibilityObj.leftFormFieldId, this.processVarList);
}
return this.getFormValue(form, visibilityObj.leftFormFieldId);
return leftValue;
}
getRightValue(form: FormModel, visibilityObj: WidgetVisibilityModel) {
@@ -231,29 +232,15 @@ export class WidgetVisibilityService {
}
getTaskProcessVariable(taskId: string): Observable<TaskProcessVariableModel[]> {
let url = `${this.alfrescoSettingsService.getBPMApiBaseUrl()}/app/rest/task-forms/${taskId}/variables`;
let options = this.getRequestOptions();
return this.http
.get(url, options)
.map((response: Response) => this.processVarList = <TaskProcessVariableModel[]> response.json())
return Observable.fromPromise(this.apiService.getInstance().activiti.taskFormsApi.getTaskFormVariables(taskId))
.map((response: TaskProcessVariableModel[]) => {
this.processVarList = response;
})
.catch(this.handleError);
}
private getHeaders(): Headers {
return new Headers({
'Accept': 'application/json',
'Content-Type': 'application/json',
'Authorization': this.authService.getTicketBpm()
});
}
private getRequestOptions(): RequestOptions {
let headers = this.getHeaders();
return new RequestOptions({headers: headers});
}
private handleError(error: Response) {
console.error(error);
return Observable.throw(error.json().error || 'Server error');
private handleError() {
console.error('Error while performing a call');
return Observable.throw('Error while performing a call - Server error');
}
}