hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-09 19:13:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added more tests

Browse Source
This commit is contained in:
Giuseppe Digilio
2018-06-19 15:10:56 +02:00
parent 4a2e2b754b
commit 3fdb074d05
7 changed files with 801 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/app/shared/form/builder/form-builder.service.ts
View File

@@ -13,7 +13,7 @@ import {
import { mergeWith, isObject } from 'lodash';
import { isEmpty, isNotEmpty, isNotNull, isNotUndefined, isNull } from '../../empty.util';
import { DynamicComboboxModel } from './ds-dynamic-form-ui/models/ds-dynamic-combobox.model';
import { DynamicQualdropModel } from './ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model';
import { SubmissionFormsModel } from '../../../core/shared/config/config-submission-forms.model';
import { DynamicConcatModel } from './ds-dynamic-form-ui/models/ds-dynamic-concat.model';
import { DynamicListCheckboxGroupModel } from './ds-dynamic-form-ui/models/list/dynamic-list-checkbox-group.model';
@@ -148,8 +148,8 @@ export class FormBuilderService extends DynamicFormService {
let controlId;
// Get the field's name
if (controlModel instanceof DynamicComboboxModel) {
// If is instance of DynamicComboboxModel take the qualdrop id as field's name
if (controlModel instanceof DynamicQualdropModel) {
// If is instance of DynamicQualdropModel take the qualdrop id as field's name
controlId = controlModel.qualdropId;
} else {
controlId = controlModel.name;
@@ -220,22 +220,26 @@ export class FormBuilderService extends DynamicFormService {
isModelInCustomGroup(model: DynamicFormControlModel) {
return model.parent &&
(model.parent instanceof DynamicConcatModel
|| model.parent instanceof DynamicComboboxModel);
|| model.parent instanceof DynamicQualdropModel);
}
hasArrayGroupValue(model: DynamicFormControlModel) {
return model && (this.isListGroup(model) || model.type === DYNAMIC_FORM_CONTROL_TYPE_TAG);
}
hasMappedGroupValue(model: DynamicFormControlModel) {
return ((model.parent && model.parent instanceof DynamicComboboxModel)
return ((model.parent && model.parent instanceof DynamicQualdropModel)
|| model.parent instanceof DynamicGroupModel);
}
isComboboxGroup(model: DynamicFormControlModel) {
return model && model instanceof DynamicComboboxModel;
isQualdropGroup(model: DynamicFormControlModel) {
return model && model instanceof DynamicQualdropModel;
}
isCustomGroup(model: DynamicFormControlModel) {
return model &&
(model instanceof DynamicConcatModel
|| model instanceof DynamicComboboxModel
|| this.isQualdropGroup(model)
|| this.isListGroup(model));
}
@@ -245,10 +249,6 @@ export class FormBuilderService extends DynamicFormService {
|| model instanceof DynamicListRadioGroupModel);
}
isModelInAuthorityGroup(model: DynamicFormControlModel) {
return model && (this.isListGroup(model) || model.type === DYNAMIC_FORM_CONTROL_TYPE_TAG);
}
isRelationGroup(model: DynamicFormControlModel) {
return model && model.type === DYNAMIC_FORM_CONTROL_TYPE_RELATION;
}