+ [displaySubmit]="false"
+ (dfChange)="onChange($event)">
@@ -54,7 +55,11 @@
-
+
{
+ this.formCollapsed = (isNotEmpty(value) && !(value.length === 1 && isObjectEmpty(value[0]))) ? Observable.of(true) : Observable.of(false);
+ });
+
this.formId = this.formService.getUniqueId(this.model.id);
this.formModel = this.formBuilderService.modelFromConfiguration(config, this.model.scopeUUID, {});
- this.chips = new Chips(this.model.value, 'value', this.model.mandatoryField);
+ this.chips = new Chips(this.model.value, 'value', this.model.mandatoryField, this.EnvConfig.submission.metadata.icons);
this.subs.push(
this.chips.chipsItems
.subscribe((subItems: any[]) => {
@@ -118,20 +130,32 @@ export class DsDynamicGroupComponent implements OnDestroy, OnInit {
return res;
}
+ onChange(event: DynamicFormControlEvent) {
+ return
+ }
+
onChipSelected(event) {
this.expandForm();
this.selectedChipItem = this.chips.getChipByIndex(event);
this.formModel.forEach((row) => {
const modelRow = row as DynamicFormGroupModel;
modelRow.group.forEach((model: DynamicInputModel) => {
- const value = this.selectedChipItem.item[model.name] === PLACEHOLDER_PARENT_METADATA ? null : this.selectedChipItem.item[model.name];
- if (model instanceof DynamicLookupModel) {
- (model as DynamicLookupModel).valueUpdates.next(value);
- } else if (model instanceof DynamicInputModel) {
- model.valueUpdates.next(value);
+ const value = (this.selectedChipItem.item[model.name] === PLACEHOLDER_PARENT_METADATA
+ || this.selectedChipItem.item[model.name].value === PLACEHOLDER_PARENT_METADATA)
+ ? null
+ : this.selectedChipItem.item[model.name];
+ if (value instanceof FormFieldMetadataValueObject || value instanceof AuthorityValueModel) {
+ model.valueUpdates.next(value.display);
} else {
- (model as any).value = value;
+ model.valueUpdates.next(value);
}
+ // if (model instanceof DynamicLookupModel) {
+ // (model as DynamicLookupModel).valueUpdates.next(value);
+ // } else if (model instanceof DynamicInputModel) {
+ // model.valueUpdates.next(value);
+ // } else {
+ // (model as any).value = value;
+ // }
});
});
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
index a3baa3de88..91bd0275e7 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
@@ -6,12 +6,11 @@ import { AuthorityService } from '../../../../../../core/integration/authority.s
import { IntegrationSearchOptions } from '../../../../../../core/integration/models/integration-options.model';
import { hasValue, isNotEmpty } from '../../../../../empty.util';
import { DynamicListCheckboxGroupModel } from './dynamic-list-checkbox-group.model';
-import { ConfigData } from '../../../../../../core/config/config-data';
-import { ConfigAuthorityModel } from '../../../../../../core/shared/config/config-authority.model';
import { FormBuilderService } from '../../../form-builder.service';
import { DynamicCheckboxModel } from '@ng-dynamic-forms/core';
import { AuthorityValueModel } from '../../../../../../core/integration/models/authority-value.model';
import { DynamicListRadioGroupModel } from './dynamic-list-radio-group.model';
+import { IntegrationData } from '../../../../../../core/integration/integration-data';
export interface ListItem {
id: string,
@@ -26,7 +25,6 @@ export interface ListItem {
templateUrl: './dynamic-list.component.html'
})
-// TODO Fare questo componente da zero
export class DsDynamicListComponent implements OnInit {
@Input() bindId = true;
@Input() group: FormGroup;
@@ -91,13 +89,13 @@ export class DsDynamicListComponent implements OnInit {
protected setOptionsFromAuthority() {
if (this.model.authorityOptions.name && this.model.authorityOptions.name.length > 0) {
const listGroup = this.group.controls[this.model.id] as FormGroup;
- this.authorityService.getEntriesByName(this.searchOptions).subscribe((authorities: ConfigData) => {
+ this.authorityService.getEntriesByName(this.searchOptions).subscribe((authorities: IntegrationData) => {
let groupCounter = 0;
let itemsPerGroup = 0;
let tempList: ListItem[] = [];
- this.authorityList = authorities.payload as ConfigAuthorityModel[];
+ this.authorityList = authorities.payload as AuthorityValueModel[];
// Make a list of available options (checkbox/radio) and split in groups of 'model.groupLength'
- (authorities.payload as ConfigAuthorityModel[]).forEach((option, key) => {
+ (authorities.payload as AuthorityValueModel[]).forEach((option, key) => {
const value = option.id || option.value;
const checked: boolean = isNotEmpty(findKey(
this.model.value,
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
index 972538efad..14f468b0f8 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
@@ -1,7 +1,6 @@
-
+ (openChange)="openChange($event);">
@@ -19,26 +18,25 @@
[placeholder]="model.placeholder"
[readonly]="model.readOnly"
(change)="$event.preventDefault()"
- (blur)="onBlurEvent($event); sdRef.close();"
- (focus)="onFocusEvent($event); sdRef.close();"
- (click)="$event.stopPropagation(); sdRef.close();"
+ (blur)="onBlurEvent($event); $event.stopPropagation(); sdRef.close();"
+ (focus)="onFocusEvent($event); $event.stopPropagation(); sdRef.close();"
+ (click)="$event.stopPropagation(); $event.stopPropagation(); sdRef.close();"
(input)="onInput($event)">
-
@@ -59,9 +57,9 @@
[placeholder]="model.placeholder | translate"
[readonly]="model.readOnly"
(change)="$event.preventDefault()"
- (blur)="onBlurEvent($event); sdRef.close();"
- (focus)="onFocusEvent($event); sdRef.close();"
- (click)="$event.stopPropagation(); sdRef.close();"
+ (blur)="onBlurEvent($event); $event.stopPropagation(); sdRef.close();"
+ (focus)="onFocusEvent($event); $event.stopPropagation(); sdRef.close();"
+ (click)="$event.stopPropagation(); $event.stopPropagation(); sdRef.close();"
(input)="onInput($event)">