From 3f4091bd16b711b17969fbfa236390b2bac77324 Mon Sep 17 00:00:00 2001 From: "CITE\\spapacharalampous" Date: Thu, 18 Jul 2024 12:57:01 +0300 Subject: [PATCH] added prefilling-sources condition on plan blueprint --- .../types/planblueprint/SectionEntity.java | 13 +++- .../BlueprintSectionImportExport.java | 11 +++ .../builder/planblueprint/SectionBuilder.java | 1 + .../SectionPersist.java | 20 ++++-- .../opencdmp/model/planblueprint/Section.java | 11 +++ .../PlanBlueprintServiceImpl.java | 5 ++ .../model/plan-blueprint/plan-blueprint.ts | 2 + .../plan-blueprint-editor.component.html | 27 +++---- .../editor/plan-blueprint-editor.component.ts | 28 ++++++++ .../editor/plan-blueprint-editor.model.ts | 4 ++ .../editor/plan-blueprint-editor.resolver.ts | 1 + .../new-description.component.html | 70 +++++++++++-------- .../new-description.component.ts | 5 ++ .../description-editor-entity.resolver.ts | 1 + .../plan-editor.component.html | 13 ++-- frontend/src/assets/i18n/baq.json | 3 +- frontend/src/assets/i18n/de.json | 3 +- frontend/src/assets/i18n/en.json | 3 +- frontend/src/assets/i18n/es.json | 3 +- frontend/src/assets/i18n/gr.json | 3 +- frontend/src/assets/i18n/hr.json | 3 +- frontend/src/assets/i18n/pl.json | 3 +- frontend/src/assets/i18n/pt.json | 3 +- frontend/src/assets/i18n/sk.json | 3 +- frontend/src/assets/i18n/sr.json | 3 +- frontend/src/assets/i18n/tr.json | 3 +- 26 files changed, 177 insertions(+), 68 deletions(-) diff --git a/backend/core/src/main/java/org/opencdmp/commons/types/planblueprint/SectionEntity.java b/backend/core/src/main/java/org/opencdmp/commons/types/planblueprint/SectionEntity.java index cbd329a0b..cdecb758c 100644 --- a/backend/core/src/main/java/org/opencdmp/commons/types/planblueprint/SectionEntity.java +++ b/backend/core/src/main/java/org/opencdmp/commons/types/planblueprint/SectionEntity.java @@ -32,7 +32,10 @@ public class SectionEntity { @XmlAttribute(name="hasTemplates") private Boolean hasTemplates; - + + @XmlAttribute(name = "prefillingSourcesEnabled") + private Boolean prefillingSourcesEnabled; + @XmlElementWrapper(name = "descriptionTemplates") @XmlElement(name = "descriptionTemplate") private List descriptionTemplates; @@ -90,6 +93,14 @@ public class SectionEntity { this.descriptionTemplates = descriptionTemplates; } + public Boolean getPrefillingSourcesEnabled() { + return this.prefillingSourcesEnabled; + } + + public void setPrefillingSourcesEnabled(Boolean prefillingSourcesEnabled) { + this.prefillingSourcesEnabled = prefillingSourcesEnabled; + } + public List getPrefillingSourcesIds() { return this.prefillingSourcesIds; } diff --git a/backend/core/src/main/java/org/opencdmp/commons/types/planblueprint/importexport/BlueprintSectionImportExport.java b/backend/core/src/main/java/org/opencdmp/commons/types/planblueprint/importexport/BlueprintSectionImportExport.java index d5023448c..f6962ae5b 100644 --- a/backend/core/src/main/java/org/opencdmp/commons/types/planblueprint/importexport/BlueprintSectionImportExport.java +++ b/backend/core/src/main/java/org/opencdmp/commons/types/planblueprint/importexport/BlueprintSectionImportExport.java @@ -31,6 +31,9 @@ public class BlueprintSectionImportExport { @XmlElement(name = "descriptionTemplate") private List descriptionTemplates; + @XmlAttribute(name = "prefillingSourcesEnabled") + private Boolean prefillingSourcesEnabled; + @XmlElementWrapper(name = "prefillingSources") @XmlElement(name = "prefillingSource") private List prefillingSources; @@ -107,6 +110,14 @@ public class BlueprintSectionImportExport { this.descriptionTemplates = descriptionTemplates; } + public Boolean getPrefillingSourcesEnabled() { + return this.prefillingSourcesEnabled; + } + + public void setPrefillingSourcesEnabled(Boolean prefillingSourcesEnabled) { + this.prefillingSourcesEnabled = prefillingSourcesEnabled; + } + public List getPrefillingSources() { return this.prefillingSources; } diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/planblueprint/SectionBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/planblueprint/SectionBuilder.java index 9a54ac3e3..f4b58c865 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/planblueprint/SectionBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/planblueprint/SectionBuilder.java @@ -67,6 +67,7 @@ public class SectionBuilder extends BaseBuilder { if (fields.hasField(this.asIndexer(Section._description))) m.setDescription(d.getDescription()); if (fields.hasField(this.asIndexer(Section._ordinal))) m.setOrdinal(d.getOrdinal()); if (fields.hasField(this.asIndexer(Section._hasTemplates))) m.setHasTemplates(d.getHasTemplates()); + if (fields.hasField(this.asIndexer(Section._prefillingSourcesEnabled))) m.setPrefillingSourcesEnabled(d.getPrefillingSourcesEnabled()); if (!descriptionTemplatesFields.isEmpty() && d.getDescriptionTemplates() != null) m.setDescriptionTemplates(this.builderFactory.builder(DescriptionTemplateBuilder.class).authorize(this.authorize).build(descriptionTemplatesFields, d.getDescriptionTemplates())); if (!fieldsFields.isEmpty() && d.getFields() != null) { m.setFields(new ArrayList<>()); diff --git a/backend/core/src/main/java/org/opencdmp/model/persist/planblueprintdefinition/SectionPersist.java b/backend/core/src/main/java/org/opencdmp/model/persist/planblueprintdefinition/SectionPersist.java index 956610f39..950713343 100644 --- a/backend/core/src/main/java/org/opencdmp/model/persist/planblueprintdefinition/SectionPersist.java +++ b/backend/core/src/main/java/org/opencdmp/model/persist/planblueprintdefinition/SectionPersist.java @@ -45,6 +45,9 @@ public class SectionPersist { public static final String _descriptionTemplates = "descriptionTemplates"; + private Boolean prefillingSourcesEnabled; + public static final String _prefillingSourcesEnabled = "prefillingSourcesEnabled"; + private List prefillingSourcesIds; public static final String _prefillingSourcesIds = "prefillingSourcesIds"; @@ -101,17 +104,17 @@ public class SectionPersist { return this.descriptionTemplates; } - public void setDescriptionTemplates(List descriptionTemplates) { - this.descriptionTemplates = descriptionTemplates; - } + public void setDescriptionTemplates(List descriptionTemplates) { this.descriptionTemplates = descriptionTemplates; } public List getPrefillingSourcesIds() { return this.prefillingSourcesIds; } - public void setPrefillingSourcesIds(List prefillingSourcesIds) { - this.prefillingSourcesIds = prefillingSourcesIds; - } + public void setPrefillingSourcesIds(List prefillingSourcesIds) { this.prefillingSourcesIds = prefillingSourcesIds; } + + public Boolean getPrefillingSourcesEnabled() { return this.prefillingSourcesEnabled; } + + public void setPrefillingSourcesEnabled(Boolean prefillingSourcesEnabled) { this.prefillingSourcesEnabled = prefillingSourcesEnabled; } @Component(SectionPersistValidator.ValidatorName) @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE) @@ -175,7 +178,10 @@ public class SectionPersist { this.spec() .iff(() -> !this.isListNullOrEmpty(item.getDescriptionTemplates())) .must(() -> item.getDescriptionTemplates().stream().map(DescriptionTemplatePersist::getDescriptionTemplateGroupId).distinct().collect(Collectors.toList()).size() == item.getDescriptionTemplates().size()) - .failOn(SectionPersist._descriptionTemplates).failWith(this.messageSource.getMessage("Validation_Unique", new Object[]{SectionPersist._descriptionTemplates}, LocaleContextHolder.getLocale())) + .failOn(SectionPersist._descriptionTemplates).failWith(this.messageSource.getMessage("Validation_Unique", new Object[]{SectionPersist._descriptionTemplates}, LocaleContextHolder.getLocale())), + this.spec() + .must(() -> !this.isNull(item.getPrefillingSourcesEnabled())) + .failOn(SectionPersist._prefillingSourcesEnabled).failWith(this.messageSource.getMessage("Validation_Required", new Object[]{SectionPersist._prefillingSourcesEnabled}, LocaleContextHolder.getLocale())) ); } diff --git a/backend/core/src/main/java/org/opencdmp/model/planblueprint/Section.java b/backend/core/src/main/java/org/opencdmp/model/planblueprint/Section.java index a97a0320e..a5edaa2cd 100644 --- a/backend/core/src/main/java/org/opencdmp/model/planblueprint/Section.java +++ b/backend/core/src/main/java/org/opencdmp/model/planblueprint/Section.java @@ -29,6 +29,9 @@ public class Section { public final static String _descriptionTemplates = "descriptionTemplates"; private List descriptionTemplates; + public final static String _prefillingSourcesEnabled = "prefillingSourcesEnabled"; + private Boolean prefillingSourcesEnabled; + public final static String _prefillingSources = "prefillingSources"; private List prefillingSources; @@ -92,6 +95,14 @@ public class Section { this.descriptionTemplates = descriptionTemplates; } + public Boolean getPrefillingSourcesEnabled() { + return prefillingSourcesEnabled; + } + + public void setPrefillingSourcesEnabled(Boolean prefillingSourcesEnabled) { + this.prefillingSourcesEnabled = prefillingSourcesEnabled; + } + public List getPrefillingSources() { return prefillingSources; } diff --git a/backend/core/src/main/java/org/opencdmp/service/planblueprint/PlanBlueprintServiceImpl.java b/backend/core/src/main/java/org/opencdmp/service/planblueprint/PlanBlueprintServiceImpl.java index 646efd20e..1b545190b 100644 --- a/backend/core/src/main/java/org/opencdmp/service/planblueprint/PlanBlueprintServiceImpl.java +++ b/backend/core/src/main/java/org/opencdmp/service/planblueprint/PlanBlueprintServiceImpl.java @@ -240,6 +240,7 @@ public class PlanBlueprintServiceImpl implements PlanBlueprintService { data.setLabel(persist.getLabel()); data.setOrdinal(persist.getOrdinal()); data.setHasTemplates(persist.getHasTemplates()); + data.setPrefillingSourcesEnabled(persist.getPrefillingSourcesEnabled()); data.setPrefillingSourcesIds(persist.getPrefillingSourcesIds()); if (!this.conventionService.isListNullOrEmpty(persist.getFields())) { data.setFields(new ArrayList<>()); @@ -527,6 +528,8 @@ public class PlanBlueprintServiceImpl implements PlanBlueprintService { xml.setDescription(entity.getDescription()); xml.setOrdinal(entity.getOrdinal()); xml.setHasTemplates(entity.getHasTemplates()); + xml.setPrefillingSourcesEnabled(entity.getPrefillingSourcesEnabled()); + List planBlueprintSystemFieldModels = new LinkedList<>(); if (!this.conventionService.isListNullOrEmpty(entity.getFields())) { for (SystemFieldEntity systemField : entity.getFields().stream().filter(x -> x.getCategory() == PlanBlueprintFieldCategory.System).map(x -> (SystemFieldEntity) x).toList()) { @@ -712,6 +715,8 @@ public class PlanBlueprintServiceImpl implements PlanBlueprintService { persist.setDescription(importXml.getDescription()); persist.setOrdinal(importXml.getOrdinal()); persist.setHasTemplates(importXml.isHasTemplates()); + persist.setPrefillingSourcesEnabled(importXml.getPrefillingSourcesEnabled()); + List planBlueprintFieldModels = new LinkedList<>(); if (!this.conventionService.isListNullOrEmpty(importXml.getSystemFields())) { for (BlueprintSystemFieldImportExport systemField : importXml.getSystemFields()) { diff --git a/frontend/src/app/core/model/plan-blueprint/plan-blueprint.ts b/frontend/src/app/core/model/plan-blueprint/plan-blueprint.ts index 562c4ffe6..59b808adc 100644 --- a/frontend/src/app/core/model/plan-blueprint/plan-blueprint.ts +++ b/frontend/src/app/core/model/plan-blueprint/plan-blueprint.ts @@ -31,6 +31,7 @@ export interface PlanBlueprintDefinitionSection { fields: FieldInSection[]; hasTemplates: boolean; descriptionTemplates?: DescriptionTemplatesInSection[]; + prefillingSourcesEnabled: boolean; prefillingSources: PrefillingSource[]; } @@ -92,6 +93,7 @@ export interface PlanBlueprintDefinitionSectionPersist { fields: FieldInSectionPersist[]; hasTemplates: boolean; descriptionTemplates?: DescriptionTemplatesInSectionPersist[]; + prefillingSourcesEnabled: boolean; prefillingSourcesIds: Guid[]; } diff --git a/frontend/src/app/ui/admin/plan-blueprint/editor/plan-blueprint-editor.component.html b/frontend/src/app/ui/admin/plan-blueprint/editor/plan-blueprint-editor.component.html index d4d7e966a..3f6d7e269 100644 --- a/frontend/src/app/ui/admin/plan-blueprint/editor/plan-blueprint-editor.component.html +++ b/frontend/src/app/ui/admin/plan-blueprint/editor/plan-blueprint-editor.component.html @@ -287,23 +287,24 @@
-
- - {{'PLAN-BLUEPRINT-EDITOR.FIELDS.PREFILLING-SOURCES' | translate}} - - {{section.get('prefillingSourcesIds').getError('backendError').message}} - -
+ +
+ + {{'PLAN-BLUEPRINT-EDITOR.FIELDS.ENABLE-PREFILLING-SOURCES' | translate}} + +
+
+ + {{'PLAN-BLUEPRINT-EDITOR.FIELDS.PREFILLING-SOURCES' | translate}} + + {{section.get('prefillingSourcesIds').getError('backendError').message}} + +
+
- - - - - - diff --git a/frontend/src/app/ui/admin/plan-blueprint/editor/plan-blueprint-editor.component.ts b/frontend/src/app/ui/admin/plan-blueprint/editor/plan-blueprint-editor.component.ts index dda9a4abe..93b0d6071 100644 --- a/frontend/src/app/ui/admin/plan-blueprint/editor/plan-blueprint-editor.component.ts +++ b/frontend/src/app/ui/admin/plan-blueprint/editor/plan-blueprint-editor.component.ts @@ -45,6 +45,7 @@ import { PlanBlueprintEditorModel, FieldInSectionEditorModel } from './plan-blue import { PlanBlueprintEditorResolver } from './plan-blueprint-editor.resolver'; import { PlanBlueprintEditorService } from './plan-blueprint-editor.service'; import { RouterUtilsService } from '@app/core/services/router/router-utils.service'; +import { PrefillingSource } from '@app/core/model/prefilling-source/prefilling-source'; @Component({ @@ -422,6 +423,18 @@ export class PlanBlueprintEditorComponent extends BaseEditor, sectionIndex: number) { const descriptionTemplatesFormArray = ((this.formGroup.get('definition').get('sections') as FormArray).at(sectionIndex).get('descriptionTemplates') as FormArray); diff --git a/frontend/src/app/ui/admin/plan-blueprint/editor/plan-blueprint-editor.model.ts b/frontend/src/app/ui/admin/plan-blueprint/editor/plan-blueprint-editor.model.ts index 2c790c233..287ce2348 100644 --- a/frontend/src/app/ui/admin/plan-blueprint/editor/plan-blueprint-editor.model.ts +++ b/frontend/src/app/ui/admin/plan-blueprint/editor/plan-blueprint-editor.model.ts @@ -178,6 +178,7 @@ export class PlanBlueprintDefinitionSectionEditorModel implements PlanBlueprintD fields: FieldInSectionEditorModel[] = []; hasTemplates: boolean; descriptionTemplates?: DescriptionTemplatesInSectionEditorModel[] = []; + prefillingSourcesEnabled: boolean; prefillingSourcesIds: Guid[]= []; protected formBuilder: UntypedFormBuilder = new UntypedFormBuilder(); @@ -193,6 +194,7 @@ export class PlanBlueprintDefinitionSectionEditorModel implements PlanBlueprintD this.description = item.description; this.ordinal = item.ordinal; this.hasTemplates = item.hasTemplates; + this.prefillingSourcesEnabled = item?.prefillingSourcesEnabled ?? false; if (item.fields) { item.fields.sort((a,b) => a.ordinal - b.ordinal).map(x => this.fields.push(new FieldInSectionEditorModel(this.validationErrorModel).fromModel(x))); } if (item.descriptionTemplates) { item.descriptionTemplates.map(x => this.descriptionTemplates.push(new DescriptionTemplatesInSectionEditorModel(this.validationErrorModel).fromModel(x))); } if (item.prefillingSources) this.prefillingSourcesIds = item.prefillingSources.map(x => x.id); @@ -219,6 +221,7 @@ export class PlanBlueprintDefinitionSectionEditorModel implements PlanBlueprintD ordinal: [{ value: this.ordinal, disabled: disabled }, context.getValidation('ordinal').validators], description: [{ value: this.description, disabled: disabled }, context.getValidation('description').validators], hasTemplates: [{ value: this.hasTemplates, disabled: disabled }, context.getValidation('hasTemplates').validators], + prefillingSourcesEnabled: [{ value: this.prefillingSourcesEnabled, disabled: disabled}, context.getValidation('prefillingSourcesEnabled').validators], fields: this.formBuilder.array( (this.fields ?? []).map( (item, index) => item.buildForm({ @@ -255,6 +258,7 @@ export class PlanBlueprintDefinitionSectionEditorModel implements PlanBlueprintD baseValidationArray.push({ key: 'fields', validators: [BackendErrorValidator(validationErrorModel, `${rootPath}fields`)] }); baseValidationArray.push({ key: 'descriptionTemplates', validators: [BackendErrorValidator(validationErrorModel, `${rootPath}descriptionTemplates`)] }); baseValidationArray.push({ key: 'prefillingSourcesIds', validators: [BackendErrorValidator(validationErrorModel, `${rootPath}prefillingSourcesIds`)] }); + baseValidationArray.push({ key: 'prefillingSourcesEnabled', validators: [BackendErrorValidator(validationErrorModel, `${rootPath}prefillingSourcesEnabled`)] }); baseValidationArray.push({ key: 'hash', validators: [] }); baseContext.validation = baseValidationArray; diff --git a/frontend/src/app/ui/admin/plan-blueprint/editor/plan-blueprint-editor.resolver.ts b/frontend/src/app/ui/admin/plan-blueprint/editor/plan-blueprint-editor.resolver.ts index b8a5055f3..299954617 100644 --- a/frontend/src/app/ui/admin/plan-blueprint/editor/plan-blueprint-editor.resolver.ts +++ b/frontend/src/app/ui/admin/plan-blueprint/editor/plan-blueprint-editor.resolver.ts @@ -52,6 +52,7 @@ export class PlanBlueprintEditorResolver extends BaseEditorResolver { [nameof(x => x.definition), nameof(x => x.sections), nameof(x => x.prefillingSources), nameof(x => x.id)].join('.'), [nameof(x => x.definition), nameof(x => x.sections), nameof(x => x.prefillingSources), nameof(x => x.label)].join('.'), [nameof(x => x.definition), nameof(x => x.sections), nameof(x => x.prefillingSources), nameof(x => x.code)].join('.'), + [nameof(x => x.definition), nameof(x => x.sections), nameof(x => x.prefillingSourcesEnabled)].join('.'), nameof(x => x.createdAt), nameof(x => x.hash), diff --git a/frontend/src/app/ui/description/editor/new-description/new-description.component.html b/frontend/src/app/ui/description/editor/new-description/new-description.component.html index 9b32597a8..631038094 100644 --- a/frontend/src/app/ui/description/editor/new-description/new-description.component.html +++ b/frontend/src/app/ui/description/editor/new-description/new-description.component.html @@ -25,41 +25,51 @@ {{'GENERAL.VALIDATION.REQUIRED' | translate}} -
-
- {{'NEW-DESCRIPTION-DIALOG.PREFILL-HINT' | translate}} -
-
-
- -
{{'NEW-DESCRIPTION-DIALOG.OR' | translate}}
- -
-
-
-

{{'NEW-DESCRIPTION-DIALOG.PREFILLING-SOURCE' | translate}}

+ +
+
+ {{'NEW-DESCRIPTION-DIALOG.PREFILL-HINT' | translate}} +
- - - - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
-
-

{{'NEW-DESCRIPTION-DIALOG.SEARCH-HEADER' | translate}}

-
- - - - -
+
+ +
{{'NEW-DESCRIPTION-DIALOG.OR' | translate}}
+ +
+
+
+

{{'NEW-DESCRIPTION-DIALOG.PREFILLING-SOURCE' | translate}}

+
+ + + + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+
+

{{'NEW-DESCRIPTION-DIALOG.SEARCH-HEADER' | translate}}

+
+ + + + +
+
-
+ +
- +
+ +
+
+ +
+
+
\ No newline at end of file diff --git a/frontend/src/app/ui/description/editor/new-description/new-description.component.ts b/frontend/src/app/ui/description/editor/new-description/new-description.component.ts index 379a3a885..f272bcce8 100644 --- a/frontend/src/app/ui/description/editor/new-description/new-description.component.ts +++ b/frontend/src/app/ui/description/editor/new-description/new-description.component.ts @@ -34,6 +34,7 @@ export class NewDescriptionDialogComponent extends BaseComponent implements OnIn plan: Plan; planSectionId: Guid; + prefillingSourcesEnabled: boolean; availableDescriptionTemplates: DescriptionTemplate[] = []; constructor(public dialogRef: MatDialogRef, @@ -46,6 +47,10 @@ export class NewDescriptionDialogComponent extends BaseComponent implements OnIn this.plan = data.plan; this.planSectionId = data.planSectionId; + + const filteredSections = data.plan?.blueprint.definition.sections.filter(x => x.id == this.planSectionId); + this.prefillingSourcesEnabled = filteredSections && filteredSections?.length > 0 ? filteredSections[0].prefillingSourcesEnabled : false; + this.availableDescriptionTemplates = this.plan.planDescriptionTemplates.filter(x => x.sectionId == this.planSectionId && x.isActive == IsActive.Active).map(x => x.currentDescriptionTemplate); } diff --git a/frontend/src/app/ui/description/editor/resolvers/description-editor-entity.resolver.ts b/frontend/src/app/ui/description/editor/resolvers/description-editor-entity.resolver.ts index 9b9669e60..d5e32f0bb 100644 --- a/frontend/src/app/ui/description/editor/resolvers/description-editor-entity.resolver.ts +++ b/frontend/src/app/ui/description/editor/resolvers/description-editor-entity.resolver.ts @@ -133,6 +133,7 @@ export class DescriptionEditorEntityResolver extends BaseEditorResolver { (prefix ? prefix + '.' : '') + [nameof(x => x.blueprint), nameof(x => x.definition), nameof(x => x.sections), nameof(x => x.hasTemplates)].join('.'), (prefix ? prefix + '.' : '') + [nameof(x => x.blueprint), nameof(x => x.definition), nameof(x => x.sections), nameof(x => x.descriptionTemplates), nameof(x => x.descriptionTemplateGroupId)].join('.'), (prefix ? prefix + '.' : '') + [nameof(x => x.blueprint), nameof(x => x.definition), nameof(x => x.sections), nameof(x => x.descriptionTemplates), nameof(x => x.maxMultiplicity)].join('.'), + (prefix ? prefix + '.' : '') + [nameof(x => x.blueprint), nameof(x => x.definition), nameof(x => x.sections), nameof(x => x.prefillingSourcesEnabled)].join('.'), (prefix ? prefix + '.' : '') + [nameof(x => x.blueprint), nameof(x => x.definition), nameof(x => x.sections), nameof(x => x.prefillingSources), nameof(x => x.id)].join('.'), (prefix ? prefix + '.' : '') + [nameof(x => x.planDescriptionTemplates), nameof(x => x.id)].join('.'), diff --git a/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.html b/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.html index ab63cd8b3..2a72ac8e2 100644 --- a/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.html +++ b/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.html @@ -147,14 +147,15 @@ -
    +
    • - - add{{'PLAN-EDITOR.ACTIONS.ADD-DESCRIPTION-IN-SECTION' | translate}} - - - add{{'PLAN-EDITOR.ACTIONS.ADD-DESCRIPTION-IN-SECTION' | translate}} + + add{{'PLAN-EDITOR.ACTIONS.ADD-DESCRIPTION-IN-SECTION' | translate}}
      • diff --git a/frontend/src/assets/i18n/baq.json b/frontend/src/assets/i18n/baq.json index 5efb749a0..2ae9d7d00 100644 --- a/frontend/src/assets/i18n/baq.json +++ b/frontend/src/assets/i18n/baq.json @@ -1650,7 +1650,8 @@ "DESCRIPTION-TEMPLATE-LABEL": "Label", "DESCRIPTION-TEMPLATE-MIN-MULTIPLICITY": "Min Multiplicity", "DESCRIPTION-TEMPLATE-MAX-MULTIPLICITY": "Max Multiplicity", - "PREFILLING-SOURCES": "Prefilling Sources" + "PREFILLING-SOURCES": "Prefilling Sources", + "ENABLE-PREFILLING-SOURCES": "Prefilling Sources" }, "ACTIONS": { "ADD-FIELD": "Add Field", diff --git a/frontend/src/assets/i18n/de.json b/frontend/src/assets/i18n/de.json index ed9fba26d..e016585d2 100644 --- a/frontend/src/assets/i18n/de.json +++ b/frontend/src/assets/i18n/de.json @@ -1650,7 +1650,8 @@ "DESCRIPTION-TEMPLATE-LABEL": "Label", "DESCRIPTION-TEMPLATE-MIN-MULTIPLICITY": "Min Multiplicity", "DESCRIPTION-TEMPLATE-MAX-MULTIPLICITY": "Max Multiplicity", - "PREFILLING-SOURCES": "Prefilling Sources" + "PREFILLING-SOURCES": "Prefilling Sources", + "ENABLE-PREFILLING-SOURCES": "Prefilling Sources" }, "ACTIONS": { "ADD-FIELD": "Add Field", diff --git a/frontend/src/assets/i18n/en.json b/frontend/src/assets/i18n/en.json index 970e61411..6b5fcecbe 100644 --- a/frontend/src/assets/i18n/en.json +++ b/frontend/src/assets/i18n/en.json @@ -1650,7 +1650,8 @@ "DESCRIPTION-TEMPLATE-LABEL": "Label", "DESCRIPTION-TEMPLATE-MIN-MULTIPLICITY": "Min Multiplicity", "DESCRIPTION-TEMPLATE-MAX-MULTIPLICITY": "Max Multiplicity", - "PREFILLING-SOURCES": "Prefilling Sources" + "PREFILLING-SOURCES": "Prefilling Sources", + "ENABLE-PREFILLING-SOURCES": "Prefilling Sources" }, "ACTIONS": { "ADD-FIELD": "Add Field", diff --git a/frontend/src/assets/i18n/es.json b/frontend/src/assets/i18n/es.json index dbb70abc0..0841ba4ec 100644 --- a/frontend/src/assets/i18n/es.json +++ b/frontend/src/assets/i18n/es.json @@ -1650,7 +1650,8 @@ "DESCRIPTION-TEMPLATE-LABEL": "Label", "DESCRIPTION-TEMPLATE-MIN-MULTIPLICITY": "Min Multiplicity", "DESCRIPTION-TEMPLATE-MAX-MULTIPLICITY": "Max Multiplicity", - "PREFILLING-SOURCES": "Prefilling Sources" + "PREFILLING-SOURCES": "Prefilling Sources", + "ENABLE-PREFILLING-SOURCES": "Prefilling Sources" }, "ACTIONS": { "ADD-FIELD": "Add Field", diff --git a/frontend/src/assets/i18n/gr.json b/frontend/src/assets/i18n/gr.json index 9281664ff..1af9a21db 100644 --- a/frontend/src/assets/i18n/gr.json +++ b/frontend/src/assets/i18n/gr.json @@ -1650,7 +1650,8 @@ "DESCRIPTION-TEMPLATE-LABEL": "Label", "DESCRIPTION-TEMPLATE-MIN-MULTIPLICITY": "Min Multiplicity", "DESCRIPTION-TEMPLATE-MAX-MULTIPLICITY": "Max Multiplicity", - "PREFILLING-SOURCES": "Prefilling Sources" + "PREFILLING-SOURCES": "Prefilling Sources", + "ENABLE-PREFILLING-SOURCES": "Prefilling Sources" }, "ACTIONS": { "ADD-FIELD": "Add Field", diff --git a/frontend/src/assets/i18n/hr.json b/frontend/src/assets/i18n/hr.json index a0cb992fe..3cc738b5c 100644 --- a/frontend/src/assets/i18n/hr.json +++ b/frontend/src/assets/i18n/hr.json @@ -1650,7 +1650,8 @@ "DESCRIPTION-TEMPLATE-LABEL": "Label", "DESCRIPTION-TEMPLATE-MIN-MULTIPLICITY": "Min Multiplicity", "DESCRIPTION-TEMPLATE-MAX-MULTIPLICITY": "Max Multiplicity", - "PREFILLING-SOURCES": "Prefilling Sources" + "PREFILLING-SOURCES": "Prefilling Sources", + "ENABLE-PREFILLING-SOURCES": "Prefilling Sources" }, "ACTIONS": { "ADD-FIELD": "Add Field", diff --git a/frontend/src/assets/i18n/pl.json b/frontend/src/assets/i18n/pl.json index 341b3d0cb..1421dfe99 100644 --- a/frontend/src/assets/i18n/pl.json +++ b/frontend/src/assets/i18n/pl.json @@ -1650,7 +1650,8 @@ "DESCRIPTION-TEMPLATE-LABEL": "Label", "DESCRIPTION-TEMPLATE-MIN-MULTIPLICITY": "Min Multiplicity", "DESCRIPTION-TEMPLATE-MAX-MULTIPLICITY": "Max Multiplicity", - "PREFILLING-SOURCES": "Prefilling Sources" + "PREFILLING-SOURCES": "Prefilling Sources", + "ENABLE-PREFILLING-SOURCES": "Prefilling Sources" }, "ACTIONS": { "ADD-FIELD": "Add Field", diff --git a/frontend/src/assets/i18n/pt.json b/frontend/src/assets/i18n/pt.json index af3e24bf9..c3ea07d1b 100644 --- a/frontend/src/assets/i18n/pt.json +++ b/frontend/src/assets/i18n/pt.json @@ -1650,7 +1650,8 @@ "DESCRIPTION-TEMPLATE-LABEL": "Label", "DESCRIPTION-TEMPLATE-MIN-MULTIPLICITY": "Min Multiplicity", "DESCRIPTION-TEMPLATE-MAX-MULTIPLICITY": "Max Multiplicity", - "PREFILLING-SOURCES": "Prefilling Sources" + "PREFILLING-SOURCES": "Prefilling Sources", + "ENABLE-PREFILLING-SOURCES": "Prefilling Sources" }, "ACTIONS": { "ADD-FIELD": "Add Field", diff --git a/frontend/src/assets/i18n/sk.json b/frontend/src/assets/i18n/sk.json index 1365594c9..40b6da80f 100644 --- a/frontend/src/assets/i18n/sk.json +++ b/frontend/src/assets/i18n/sk.json @@ -1650,7 +1650,8 @@ "DESCRIPTION-TEMPLATE-LABEL": "Label", "DESCRIPTION-TEMPLATE-MIN-MULTIPLICITY": "Min Multiplicity", "DESCRIPTION-TEMPLATE-MAX-MULTIPLICITY": "Max Multiplicity", - "PREFILLING-SOURCES": "Prefilling Sources" + "PREFILLING-SOURCES": "Prefilling Sources", + "ENABLE-PREFILLING-SOURCES": "Prefilling Sources" }, "ACTIONS": { "ADD-FIELD": "Add Field", diff --git a/frontend/src/assets/i18n/sr.json b/frontend/src/assets/i18n/sr.json index 0d26fd9c9..e0eabeb39 100644 --- a/frontend/src/assets/i18n/sr.json +++ b/frontend/src/assets/i18n/sr.json @@ -1650,7 +1650,8 @@ "DESCRIPTION-TEMPLATE-LABEL": "Label", "DESCRIPTION-TEMPLATE-MIN-MULTIPLICITY": "Min Multiplicity", "DESCRIPTION-TEMPLATE-MAX-MULTIPLICITY": "Max Multiplicity", - "PREFILLING-SOURCES": "Prefilling Sources" + "PREFILLING-SOURCES": "Prefilling Sources", + "ENABLE-PREFILLING-SOURCES": "Prefilling Sources" }, "ACTIONS": { "ADD-FIELD": "Add Field", diff --git a/frontend/src/assets/i18n/tr.json b/frontend/src/assets/i18n/tr.json index 66b2d3fd0..d49c8ed76 100644 --- a/frontend/src/assets/i18n/tr.json +++ b/frontend/src/assets/i18n/tr.json @@ -1650,7 +1650,8 @@ "DESCRIPTION-TEMPLATE-LABEL": "Label", "DESCRIPTION-TEMPLATE-MIN-MULTIPLICITY": "Min Multiplicity", "DESCRIPTION-TEMPLATE-MAX-MULTIPLICITY": "Max Multiplicity", - "PREFILLING-SOURCES": "Prefilling Sources" + "PREFILLING-SOURCES": "Prefilling Sources", + "ENABLE-PREFILLING-SOURCES": "Prefilling Sources" }, "ACTIONS": { "ADD-FIELD": "Add Field",