diff --git a/.liquibase/Data_alias/basic/2021.0.2/AttributeInteger/add_attributeValidationParams.xml b/.liquibase/Data_alias/basic/2021.0.2/AttributeInteger/add_attributeValidationParams.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e079628f0890a9012095934de6863a532528abe0
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.0.2/AttributeInteger/add_attributeValidationParams.xml
@@ -0,0 +1,10 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="s.listl" id="4b3b9c3b-a0d3-4dbb-a6ab-69da2d9ae57a">
+ <addColumn tableName="AB_ATTRIBUTE">
+ <column name="VALIDATIONPARAMETERS" type="NVARCHAR(512)"/>
+ </addColumn>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.0.2/AttributeInteger/changelog.xml b/.liquibase/Data_alias/basic/2021.0.2/AttributeInteger/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ba98ef526cbd3d91fced64c8f45af4627670362d
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.0.2/AttributeInteger/changelog.xml
@@ -0,0 +1,7 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <include relativeToChangelogFile="true" file="add_attributeValidationParams.xml"/>
+ <include relativeToChangelogFile="true" file="insert_attributeTypeInteger.xml"/>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.0.2/AttributeInteger/insert_attributeTypeInteger.xml b/.liquibase/Data_alias/basic/2021.0.2/AttributeInteger/insert_attributeTypeInteger.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f8ad63956268ec21ff5bc6a169e1b5e7103c6808
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.0.2/AttributeInteger/insert_attributeTypeInteger.xml
@@ -0,0 +1,23 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="s.listl" id="f2942a4c-96e2-4a85-81f2-153fc3f77a6c">
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="87c376e0-8a25-4a0e-913c-885ca7fe69cc"/>
+ <column name="KEYID" value="INTEGER"/>
+ <column name="TITLE" value="Integer"/>
+ <column name="CONTAINER" value="AttributeType"/>
+ <column name="AB_KEYWORD_CATEGORY_ID" value="ad91fa20-157b-4e57-b9ad-1281e40024b3"/>
+ <column name="SORTING" valueNumeric="12"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+ <insert tableName="ab_keyword_attributerelation">
+ <column name="AB_KEYWORD_ENTRY_ID" value="87c376e0-8a25-4a0e-913c-885ca7fe69cc"/>
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="3e845022-cae2-4229-b199-1df03eee717e"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="307ecfc6-15c8-4ab9-8afa-e97b90a00c5f"/>
+ <column name="CHAR_VALUE" value="VAADIN:HASH"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.0.2/changelog.xml b/.liquibase/Data_alias/basic/2021.0.2/changelog.xml
index 3c134bb12b911228744962c5bfea956078ea0237..62b2dafe9c72843ef097c3145e561bd27f9e3de8 100644
--- a/.liquibase/Data_alias/basic/2021.0.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2021.0.2/changelog.xml
@@ -5,4 +5,5 @@
<include relativeToChangelogFile="true" file="alter_CompetitionExpandReasonSize.xml"/>
<include relativeToChangelogFile="true" file="Checklists/changelog.xml"/>
<include relativeToChangelogFile="true" file="change_SalesprojectMemberRole.xml"/>
+ <include relativeToChangelogFile="true" file="AttributeInteger/changelog.xml"/>
</databaseChangeLog>
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index abce13e87dc9a3833ecaa8cc1da7dbe3f9a5fbc9..bf89272bc756faa360048b55075e1fde91cf8d9e 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -6102,6 +6102,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>VALIDATIONPARAMETERS</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="512" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
diff --git a/entity/AttributeRelation_entity/AttributeRelation_entity.aod b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
index 6d8fcd2fb05d3259a0b339733d9eaa4b9d5a69e2..05c0bf6f0734e4ea7c8fbbd41efd67172e936955 100644
--- a/entity/AttributeRelation_entity/AttributeRelation_entity.aod
+++ b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
@@ -130,6 +130,7 @@
<stateProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/value/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/value/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/value/displayValueProcess.js</displayValueProcess>
+ <onValidation>%aditoprj%/entity/AttributeRelation_entity/entityfields/value/onValidation.js</onValidation>
</entityField>
<entityConsumer>
<name>SpecificAttribute</name>
@@ -316,6 +317,7 @@
<mandatoryProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/value_lookup/mandatoryProcess.js</mandatoryProcess>
<stateProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/value_lookup/stateProcess.js</stateProcess>
<displayValueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/value_lookup/displayValueProcess.js</displayValueProcess>
+ <onValidation>%aditoprj%/entity/AttributeRelation_entity/entityfields/value_lookup/onValidation.js</onValidation>
</entityField>
<entityConsumer>
<name>Objects</name>
@@ -389,6 +391,10 @@
</entityParameter>
</children>
</entityProvider>
+ <entityField>
+ <name>VALIDATIONPARAMETERS</name>
+ <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/validationparameters/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/AttributeRelation_entity/entityfields/validationparameters/valueProcess.js b/entity/AttributeRelation_entity/entityfields/validationparameters/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..fcb7189951652485e7d1a88769708b7a0ee81a5a
--- /dev/null
+++ b/entity/AttributeRelation_entity/entityfields/validationparameters/valueProcess.js
@@ -0,0 +1,12 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+import("Sql_lib");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+ result.string(newSelect("VALIDATIONPARAMETERS")
+ .from("AB_ATTRIBUTE")
+ .where("AB_ATTRIBUTE.AB_ATTRIBUTEID", "$field.AB_ATTRIBUTE_ID")
+ .cell());
+}
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/value/onValidation.js b/entity/AttributeRelation_entity/entityfields/value/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..d2f774193b62a68cfde69f37ce3ee9b740f1ac3c
--- /dev/null
+++ b/entity/AttributeRelation_entity/entityfields/value/onValidation.js
@@ -0,0 +1,12 @@
+import("Util_lib");
+import("system.result");
+import("system.vars");
+import("Attribute_lib");
+
+var attributeType = AttributeTypes.get(vars.get("$field.ATTRIBUTE_TYPE"));
+if (attributeType && !attributeType.useLookup)
+{
+ var validationResult = attributeType.validateValue(vars.get("$local.value"), Utils.parseJSON(vars.get("$field.VALIDATIONPARAMETERS")));
+ if (validationResult && validationResult !== true)
+ result.string(validationResult);
+}
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/value_lookup/onValidation.js b/entity/AttributeRelation_entity/entityfields/value_lookup/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..26590927b278e6a71b75d42c2f5e9d5a4b5da26e
--- /dev/null
+++ b/entity/AttributeRelation_entity/entityfields/value_lookup/onValidation.js
@@ -0,0 +1,12 @@
+import("Util_lib");
+import("system.result");
+import("system.vars");
+import("Attribute_lib");
+
+var attributeType = AttributeTypes.get(vars.get("$field.ATTRIBUTE_TYPE"));
+if (attributeType && attributeType.useLookup)
+{
+ var validationResult = attributeType.validateValue(vars.get("$local.value"), Utils.parseJSON(vars.get("$field.VALIDATIONPARAMETERS")));
+ if (validationResult && validationResult !== true)
+ result.string(validationResult);
+}
\ No newline at end of file
diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index 8774cf43e3a78aece8ec5c3e63aedb54c23aa218..52049d2bae1366fc8a27a2dbdc032bf69e57e1c8 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -497,6 +497,13 @@
</entityParameter>
</children>
</entityProvider>
+ <entityField>
+ <name>VALIDATIONPARAMETERS</name>
+ </entityField>
+ <entityField>
+ <name>VALIDATIONPARAMDEFINITION</name>
+ <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/validationparamdefinition/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
@@ -514,45 +521,48 @@
<name>UID.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
- <name>ATTRIBUTE_PARENT_ID.value</name>
+ <name>ATTRIBUTE_NAME.value</name>
<isFilterable v="true" />
<isLookupFilter v="true" />
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
- <name>ATTRIBUTE_NAME.value</name>
- <isFilterable v="true" />
- <isLookupFilter v="true" />
+ <name>FULL_ATTRIBUTE_NAME.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
- <name>ATTRIBUTE_ACTIVE.value</name>
+ <name>ATTRIBUTE_PARENT_ID.value</name>
<isFilterable v="true" />
<isLookupFilter v="true" />
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
- <name>DROPDOWNDEFINITION.value</name>
+ <name>ATTRIBUTE_PARENT_ID.displayValue</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
- <name>DROPDOWNFILTER.value</name>
+ <name>ATTRIBUTE_TYPE.value</name>
+ <isFilterable v="true" />
+ <isLookupFilter v="true" />
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
- <name>SORTING.value</name>
+ <name>ATTRIBUTE_TYPE.displayValue</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
- <name>ATTRIBUTE_TYPE.value</name>
+ <name>ATTRIBUTE_ACTIVE.value</name>
<isFilterable v="true" />
<isLookupFilter v="true" />
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
- <name>ATTRIBUTE_TYPE.displayValue</name>
+ <name>SORTING.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
- <name>USAGELIST.value</name>
+ <name>DROPDOWNDEFINITION.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
- <name>ATTRIBUTE_PARENT_ID.displayValue</name>
+ <name>DROPDOWNFILTER.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
- <name>FULL_ATTRIBUTE_NAME.value</name>
+ <name>VALIDATIONPARAMETERS.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>USAGELIST.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>USAGE_FILTER.value</name>
diff --git a/entity/Attribute_entity/entityfields/dropdowndefinition/dropDownProcess.js b/entity/Attribute_entity/entityfields/dropdowndefinition/dropDownProcess.js
index 1888819bd70e3347596c0f1929902ce80c0f4158..3feaa53b20db9a340c13e426cdf5160973f28801 100644
--- a/entity/Attribute_entity/entityfields/dropdowndefinition/dropDownProcess.js
+++ b/entity/Attribute_entity/entityfields/dropdowndefinition/dropDownProcess.js
@@ -1,13 +1,13 @@
-import("system.translate");
-import("Context_lib");
import("system.vars");
import("system.result");
-import("Keyword_lib");
import("Attribute_lib");
-var res = [];
-var type = vars.get("$field.ATTRIBUTE_TYPE").trim();
-var getDropDownFn = type && AttributeTypes[type] && AttributeTypes[type].getDropDownDefinitions;
-if (getDropDownFn instanceof Function)
- res = getDropDownFn.call();
-result.object(res);
+var attributeType = AttributeTypes.get(vars.get("$field.ATTRIBUTE_TYPE"));
+if (attributeType)
+{
+ result.object(attributeType.getDropDownDefinitions() || []);
+}
+else
+{
+ result.object([]);
+}
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/dropdowndefinition/placeholderProcess.js b/entity/Attribute_entity/entityfields/dropdowndefinition/placeholderProcess.js
index ba378a119d9b896e9edabdbdabb7df1f743a4816..4b02b2b5799d21ea78a2b0b42d227e8b0186db1c 100644
--- a/entity/Attribute_entity/entityfields/dropdowndefinition/placeholderProcess.js
+++ b/entity/Attribute_entity/entityfields/dropdowndefinition/placeholderProcess.js
@@ -3,4 +3,6 @@ import("system.vars");
import("system.result");
import("Attribute_lib");
-result.string(translate.text(AttributeTypeUtil.getDropDownDefinitionTitle(vars.get("$field.ATTRIBUTE_TYPE"))));
\ No newline at end of file
+var type = AttributeTypes.get(vars.get("$field.ATTRIBUTE_TYPE"));
+var title = type ? type.dropDownDefinitionTitle : "";
+result.string(translate.text(title));
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/dropdowndefinition/stateProcess.js b/entity/Attribute_entity/entityfields/dropdowndefinition/stateProcess.js
index 7d544038317ed502315a9d964113718794496241..48588357052016d30ff39963139424b60444a9b1 100644
--- a/entity/Attribute_entity/entityfields/dropdowndefinition/stateProcess.js
+++ b/entity/Attribute_entity/entityfields/dropdowndefinition/stateProcess.js
@@ -4,8 +4,8 @@ import("system.result");
import("Attribute_lib");
var fieldState = neon.COMPONENTSTATE_INVISIBLE;
-var type = vars.get("$field.ATTRIBUTE_TYPE").trim();
-if (type && AttributeTypes[type] && AttributeTypes[type].getDropDownDefinitions)
+var type = AttributeTypes.get(vars.get("$field.ATTRIBUTE_TYPE"));
+if (type && type.dropDownDefinitionTitle)
{
if (AttributeUtil.hasRelations(vars.get("$field.UID")))
fieldState = neon.COMPONENTSTATE_READONLY;
diff --git a/entity/Attribute_entity/entityfields/dropdowndefinition/titleProcess.js b/entity/Attribute_entity/entityfields/dropdowndefinition/titleProcess.js
index ba378a119d9b896e9edabdbdabb7df1f743a4816..4b02b2b5799d21ea78a2b0b42d227e8b0186db1c 100644
--- a/entity/Attribute_entity/entityfields/dropdowndefinition/titleProcess.js
+++ b/entity/Attribute_entity/entityfields/dropdowndefinition/titleProcess.js
@@ -3,4 +3,6 @@ import("system.vars");
import("system.result");
import("Attribute_lib");
-result.string(translate.text(AttributeTypeUtil.getDropDownDefinitionTitle(vars.get("$field.ATTRIBUTE_TYPE"))));
\ No newline at end of file
+var type = AttributeTypes.get(vars.get("$field.ATTRIBUTE_TYPE"));
+var title = type ? type.dropDownDefinitionTitle : "";
+result.string(translate.text(title));
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/dropdowndefinition/valueProcess.js b/entity/Attribute_entity/entityfields/dropdowndefinition/valueProcess.js
index d44ff329df79b2541e8b7c2bba9a878ce20df523..80e6eff178818d34458de8c511c2faed15ba277d 100644
--- a/entity/Attribute_entity/entityfields/dropdowndefinition/valueProcess.js
+++ b/entity/Attribute_entity/entityfields/dropdowndefinition/valueProcess.js
@@ -2,6 +2,6 @@ import("system.result");
import("system.vars");
import("Attribute_lib");
-var type = vars.get("$field.ATTRIBUTE_TYPE").trim();
-if (type && AttributeTypes[type] && typeof(AttributeTypes[type].getDropDownDefinitions) !== "function")
+var type = AttributeTypes.get(vars.get("$field.ATTRIBUTE_TYPE"));
+if (type && !type.getDropDownDefinitions())
result.string("");
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/validationparamdefinition/valueProcess.js b/entity/Attribute_entity/entityfields/validationparamdefinition/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ebeed24531f076642a60756848fc2bb12d258348
--- /dev/null
+++ b/entity/Attribute_entity/entityfields/validationparamdefinition/valueProcess.js
@@ -0,0 +1,22 @@
+import("system.neon");
+import("Util_lib");
+import("system.vars");
+import("system.result");
+import("Attribute_lib");
+
+var recordstate = vars.get("$sys.recordstate");
+if (recordstate == neon.OPERATINGSTATE_NEW || recordstate == neon.OPERATINGSTATE_EDIT)
+{
+ var attributeType = AttributeTypes.get(vars.get("$field.ATTRIBUTE_TYPE"));
+ var validationParamDefinition = attributeType ? attributeType.getValidationParameters() : null;
+ if (recordstate == neon.OPERATINGSTATE_EDIT && !Utils.isNullOrEmpty(validationParamDefinition) && vars.get("$this.value") == null)
+ {
+ var parameterValues = Utils.parseJSON(vars.get("$field.VALIDATIONPARAMETERS")) || {};
+ validationParamDefinition.forEach(function (param)
+ {
+ if (param.id in parameterValues && param.value == null)
+ param.value = parameterValues[param.id];
+ });
+ }
+ result.string(validationParamDefinition ? JSON.stringify(validationParamDefinition) : "");
+}
\ No newline at end of file
diff --git a/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js b/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js
index 6248fae571eb24e8cd7bc79fb5b35fe45df58a6d..9f76fa5aee84c3a16afea2c3efe3900b03cf64c1 100644
--- a/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js
@@ -14,8 +14,8 @@ var childId = vars.get("$param.ChildId_param");
var childType = vars.get("$param.ChildType_param");
var objectType = vars.get("$param.ObjectType_param");
-var filteredIds = vars.get("$param.FilteredAttributeIds_param") ? JSON.parse(vars.getString("$param.FilteredAttributeIds_param")) : null
-var attributeCountObj = vars.get("$param.AttributeCount_param") ? JSON.parse(vars.getString("$param.AttributeCount_param")) : null;
+var filteredIds = Utils.parseJSON(vars.get("$param.FilteredAttributeIds_param"));
+var attributeCountObj = Utils.parseJSON(vars.get("$param.AttributeCount_param"));
var displaySimpleName = Utils.toBoolean(vars.get("$param.DisplaySimpleName_param"));
var themeObjectRowId = vars.get("$param.ThemeObjectRowId_param");
@@ -45,12 +45,12 @@ else if (objectType) //if there's an objectType, it comes from the AttributeRel
{
translateName = true;
- var ids = AttributeUtil.getPossibleAttributes(objectType, true, filteredIds, attributeCountObj);
+ var attributeIds = AttributeUtil.getPossibleAttributes(objectType, true, filteredIds, attributeCountObj);
- if (Utils.isEmpty(ids))
+ if (Utils.isEmpty(attributeIds))
condition.noResult();
else
- condition.and("AB_ATTRIBUTE.AB_ATTRIBUTEID", ids, SqlBuilder.IN())
+ condition.and("AB_ATTRIBUTE.AB_ATTRIBUTEID", attributeIds, SqlBuilder.IN())
.and("AB_ATTRIBUTE.ATTRIBUTE_TYPE", AttributeTypes.THEME(), !themeObjectRowId ? SqlBuilder.NOT_EQUAL() : undefined);
}
else if (parentId)
@@ -90,134 +90,143 @@ var filterCondition = new FilterSqlTranslator(vars.get("$local.filter"), "AB_ATT
.getSqlCondition();
condition.andIfSet(filterCondition);
-var usages;
-if (fetchUsages) //this query is only necessary in Attribute, not in AttributeRelation
-{
- var usageTbl = newSelect("AB_ATTRIBUTE_ID, OBJECT_TYPE")
- .from("AB_ATTRIBUTEUSAGE")
- .join("AB_ATTRIBUTE", "AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID")
- .whereIfSet(condition)
- .table();
- usages = {};
- for (let i = 0, l = usageTbl.length; i < l; i++)
- {
- let attrId = usageTbl[i][0];
- if (attrId in usages)
- usages[attrId].push(usageTbl[i][1]);
- else
- usages[attrId] = [usageTbl[i][1]];
- }
-}
+var usageLoader = new AttributeUsageLoader();
+if (fetchUsages)
+ usageLoader.fetchUsages(condition);
+
+var attributes = newSelect([
+ "AB_ATTRIBUTEID",
+ "ATTRIBUTE_PARENT_ID",
+ "ATTRIBUTE_NAME",
+ "ATTRIBUTE_ACTIVE",
+ "DROPDOWNDEFINITION",
+ "DROPDOWNFILTER",
+ "VALIDATIONPARAMETERS",
+ "SORTING",
+ "ATTRIBUTE_TYPE",
+ KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.attributeType(), "ATTRIBUTE_TYPE")
+ ])
+ .from("AB_ATTRIBUTE")
+ .whereIfSet(condition)
+ .orderBy(["ATTRIBUTE_PARENT_ID", "SORTING", "ATTRIBUTE_NAME"])
+ .table();
-var attributes = newSelect(["AB_ATTRIBUTEID, ATTRIBUTE_PARENT_ID, ATTRIBUTE_NAME, ATTRIBUTE_ACTIVE, DROPDOWNDEFINITION, DROPDOWNFILTER, SORTING, ATTRIBUTE_TYPE",
- KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.attributeType(), "ATTRIBUTE_TYPE"), //3
- "'', '', ''"])
- .from("AB_ATTRIBUTE")
- .whereIfSet(condition)
- .orderBy("ATTRIBUTE_PARENT_ID, SORTING, ATTRIBUTE_NAME")
- .table();
+var nameResolver = new AttributeNameResolver();
+if (attributes.length !== 0)
+ nameResolver.fetchNames(translateName);
-var allNames = newSelect("AB_ATTRIBUTEID, ATTRIBUTE_PARENT_ID, ATTRIBUTE_NAME")
- .from("AB_ATTRIBUTE")
- .table(Utils.isEmpty(attributes));
-
-var attrNameData = {};
-for (let i = 0, l = allNames.length; i < l; i++)
+var attributesById = new Map();
+attributes.forEach(function ([attributeId, parentId, simpleName, isActive,
+ dropDownDefinition, dropDownFilter, validationParameters, sorting, type, typeName])
{
- attrNameData[allNames[i][0]] = [
- allNames[i][1],
- translateName
- ? translate.text(allNames[i][2])
- : allNames[i][2]
- ];
-}
-var nameCache = {};
+ attributesById.set(attributeId, [
+ attributeId,
+ simpleName,
+ displaySimpleName ? nameResolver.getSimpleName(attributeId) : nameResolver.getFullName(attributeId),
+ parentId,
+ nameResolver.getFullName(parentId),
+ type,
+ typeName,
+ isActive,
+ sorting,
+ dropDownDefinition,
+ dropDownFilter,
+ validationParameters,
+ type != AttributeTypes.COMBOVALUE() ? usageLoader.getUsageSummary(attributeId) : "",
+ "usageFilter",
+ false
+ ]);
+});
+
+var resultTable = [];
+do {
+ var oldSize = resultTable.length;
+ attributesById.forEach(function (row, id)
+ {
+ var parentId = row[3];
+ //rows that are already in the result array are removed from the attributesById Map, so if the parentId is in that Map,
+ //the parent has not been added yet
+ if (!parentId || !attributesById.has(parentId))
+ {
+ resultTable.push(row);
+ attributesById["delete"](id);
+ }
+ });
+} while (oldSize != resultTable.length); //stops the loop when no new items were added so that recursive relations between attributes don't cause an infinite loop
-var res = _buildAttributeTable(attributes, usages);
-result.object(res);
+result.object(resultTable);
-//sorts the records in a way that a tree can be built and adds values
-function _buildAttributeTable (pAttributes, pUsages)
+
+function AttributeNameResolver ()
{
- var rows = {};
- var allIds = {};
-
- //fills the allIds object, the object is used for checking if a parent exists in the array
- for (let i = 0, l = pAttributes.length; i < l; i++)
- allIds[pAttributes[i][0]] = true;
-
- var arrayIndex = 0;
-
- do {
- var oldIndex = arrayIndex;
- pAttributes.forEach(function (row)
- {
- //item will be added if the id is not already in the object and
- //the parent is already added (or the parent is not in the array)
- if (!(row[0] in this) && (row[1] in this || !allIds[row[1]]))
- this[row[0]] = {
- data : row,
- index : arrayIndex++
- };
- }, rows);
- } while (oldIndex != arrayIndex); //stops the loop when no new items were added so that recursive relations between attributes don't cause an infinite loop
-
- var sortedArray = new Array(Object.keys(rows).length);
- for (let i in rows)
+ this.cache = new Map();
+ this.nameData = new Map();
+ this.fetchNames = function (pTranslateNames)
{
- let rowData = rows[i].data;
- if (pUsages && rowData[7].trim() != AttributeTypes.COMBOVALUE() && i in pUsages)
+ var allNames = newSelect(["AB_ATTRIBUTEID", "ATTRIBUTE_PARENT_ID", "ATTRIBUTE_NAME"])
+ .from("AB_ATTRIBUTE")
+ .table();
+ allNames.forEach(function ([attributeId, parentId, attributeName])
{
- rowData[9] = pUsages[i].map(function (usage)
- {
- return ContextUtils.getTitle(usage, true);
- }).join(", ");
- }
- rowData[10] = _getFullName(rowData[1]); //parent full name
- rowData[11] = _getFullName(rowData[0], displaySimpleName);
- rowData[12] = "dummy";
- rowData[13] = false;
- sortedArray[rows[i].index] = rowData;
+ this.nameData.set(attributeId, {
+ parentId: parentId,
+ name: pTranslateNames ? translate.text(attributeName) : attributeName
+ });
+ }, this);
+ }
+ this.getSimpleName = function (pAttributeId)
+ {
+ if (this.nameData.has(pAttributeId))
+ return this.nameData.get(pAttributeId).name;
+ return "";
}
-
- return sortedArray;
-
-
- /**
- * builds the full attribute name from the pre-loaded parent names and adds all parent names
- * if required
- */
- function _getFullName (pAttributeId, pSimpleName)
+ this.getFullName = function (pAttributeId)
{
- if (!pAttributeId)
+ if (!pAttributeId || !this.nameData.has(pAttributeId)) //if the id is not in this.nameData, it does not exist
return "";
- var attrId = pAttributeId;
- var fullName = [];
+ if (this.cache.has(pAttributeId))
+ return this.cache.get(pAttributeId);
- while (attrId)
+ var attributeData = this.nameData.get(pAttributeId);
+ var fullName = attributeData.name;
+ if (attributeData.parentId)
{
- let name = null;
- if (attrId in nameCache)
- {
- name = nameCache[attrId];
- attrId = null;
- }
- else if (attrId in attrNameData)
- {
- name = attrNameData[attrId][1];
- attrId = attrNameData[attrId][0]; //next parent
- }
- else
- attrId = null;
- if (name)
- fullName.unshift(name);
- if (pSimpleName)
- break;
+ var parentName = this.getFullName(attributeData.parentId);
+ if (parentName)
+ fullName = parentName + " / " + fullName;
}
-
- fullName = fullName.join(" / ");
- nameCache[pAttributeId] = fullName;
-
+ this.cache.set(pAttributeId, fullName);
return fullName;
}
}
+
+function AttributeUsageLoader ()
+{
+ this.usageData = new Map();
+ this.fetchUsages = function (pCondition)
+ {
+ var usages = newSelect(["AB_ATTRIBUTE_ID", "OBJECT_TYPE"])
+ .from("AB_ATTRIBUTEUSAGE")
+ .join("AB_ATTRIBUTE", "AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID")
+ .whereIfSet(pCondition)
+ .table();
+ usages.forEach(function ([attributeId, objectType])
+ {
+ if (this.usageData.has(attributeId))
+ this.usageData.get(attributeId).push(objectType);
+ else
+ this.usageData.set(attributeId, [objectType]);
+ }, this);
+ }
+ this.getUsages = function (pAttributeId)
+ {
+ return this.usageData.get(pAttributeId) || [];
+ }
+ this.getUsageSummary = function (pAttributeId)
+ {
+ return this.getUsages(pAttributeId).map(function (usage)
+ {
+ return ContextUtils.getTitle(usage, true);
+ }).join(", ");
+ }
+}
\ No newline at end of file
diff --git a/entity/Attribute_entity/recordcontainers/jdito/onInsert.js b/entity/Attribute_entity/recordcontainers/jdito/onInsert.js
index 0299b3290de6d826d7c40ba7e93f7653950fe572..0d1ffc2558febe310bac1d9c23f2959b0c2ccb50 100644
--- a/entity/Attribute_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/Attribute_entity/recordcontainers/jdito/onInsert.js
@@ -15,14 +15,15 @@ if (!sorting && parentId)
}
new SqlBuilder().insertFields({
- "AB_ATTRIBUTEID" : rowdata["UID.value"],
- "ATTRIBUTE_PARENT_ID" : parentId,
- "DROPDOWNDEFINITION" : rowdata["DROPDOWNDEFINITION.value"],
- "ATTRIBUTE_ACTIVE" : rowdata["ATTRIBUTE_ACTIVE.value"],
- "ATTRIBUTE_NAME" : rowdata["ATTRIBUTE_NAME.value"],
- "ATTRIBUTE_TYPE" : rowdata["ATTRIBUTE_TYPE.value"],
- "DROPDOWNFILTER" : rowdata["DROPDOWNFILTER.value"],
- "SORTING" : sorting
+ "AB_ATTRIBUTEID": rowdata["UID.value"],
+ "ATTRIBUTE_PARENT_ID": parentId,
+ "DROPDOWNDEFINITION": rowdata["DROPDOWNDEFINITION.value"],
+ "ATTRIBUTE_ACTIVE": rowdata["ATTRIBUTE_ACTIVE.value"],
+ "ATTRIBUTE_NAME": rowdata["ATTRIBUTE_NAME.value"],
+ "ATTRIBUTE_TYPE": rowdata["ATTRIBUTE_TYPE.value"],
+ "DROPDOWNFILTER": rowdata["DROPDOWNFILTER.value"],
+ "VALIDATIONPARAMETERS": rowdata["VALIDATIONPARAMETERS.value"],
+ "SORTING": sorting
}, "AB_ATTRIBUTE");
if (rowdata["ATTRIBUTE_PARENT_ID.value"] && rowdata["ATTRIBUTE_TYPE.value"] !== AttributeTypes.COMBOVALUE() && vars.get("$param.GetOnlyFirstLevelChildren_param"))
diff --git a/entity/Attribute_entity/recordcontainers/jdito/onUpdate.js b/entity/Attribute_entity/recordcontainers/jdito/onUpdate.js
index b3012b5a5b5ff44e63a53a1dbd5c0df4b797764b..878f822d4543074e43e071e1746020aeb3fdd99c 100644
--- a/entity/Attribute_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/Attribute_entity/recordcontainers/jdito/onUpdate.js
@@ -10,6 +10,7 @@ var dbFields = {
"ATTRIBUTE_NAME.value" : "ATTRIBUTE_NAME",
"ATTRIBUTE_TYPE.value": "ATTRIBUTE_TYPE",
"DROPDOWNFILTER.value": "DROPDOWNFILTER",
+ "VALIDATIONPARAMETERS.value": "VALIDATIONPARAMETERS",
"SORTING.value" : "SORTING"
};
var fieldValues = {};
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 5460db416ce6208b991345fe8be25ecebfe0bd2a..73bbfa9c8373665c9a4dc34691bfbc6f40f7909e 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -8139,6 +8139,45 @@
<entry>
<key>On site</key>
</entry>
+ <entry>
+ <key>Event Data</key>
+ </entry>
+ <entry>
+ <key>On Site</key>
+ </entry>
+ <entry>
+ <key>Event Type</key>
+ </entry>
+ <entry>
+ <key>New child product</key>
+ </entry>
+ <entry>
+ <key>Communication: Link</key>
+ </entry>
+ <entry>
+ <key>Event Begin</key>
+ </entry>
+ <entry>
+ <key>Communication: Phone</key>
+ </entry>
+ <entry>
+ <key>Event</key>
+ </entry>
+ <entry>
+ <key>other</key>
+ </entry>
+ <entry>
+ <key>Communication: Mail</key>
+ </entry>
+ <entry>
+ <key>Vacation</key>
+ </entry>
+ <entry>
+ <key>Event End</key>
+ </entry>
+ <entry>
+ <key>On site</key>
+ </entry>
<entry>
<key>Price could not be determined</key>
</entry>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 29f3d1134367471ac937b3f7dd14e3f82e2a7bed..0d380fbc994ee3a378e4c1f8e934cb8b05e1e97a 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -10,10 +10,18 @@
<key>Event End</key>
<value>Veranstaltungs Ende</value>
</entry>
+ <entry>
+ <key>Value is too big, the maximum is %0</key>
+ <value>Wert ist zu groß, das Maximum ist %0</value>
+ </entry>
<entry>
<key>The max participants count can not be equal or less then 0</key>
<value>Die maximale Teilnehmerzahl muss größer 0 sein!</value>
</entry>
+ <entry>
+ <key>Value is too small, the minimum is %0</key>
+ <value>Wert ist zu klein, das Minimum ist %0</value>
+ </entry>
<entry>
<key>Object not found</key>
<value>Objekt nicht gefunden
@@ -31,6 +39,10 @@
<key>EML files can't be edited here. You can download, edit and reupload the template to change the content.</key>
<value>Das Bearbeiten von EML-Dateien ist hier nicht möglich. Um den Inhalt zu ändern, können Sie die Vorlage herunterladen, bearbeiten und erneut hochladen.</value>
</entry>
+ <entry>
+ <key>Value must be an integer</key>
+ <value>Wert muss eine Ganzzahl sein</value>
+ </entry>
<entry>
<key>Checklist entries</key>
<value>Checklisteneinträge</value>
@@ -8999,6 +9011,10 @@ Bitte Datumseingabe prüfen</value>
<key>Lead Imports</key>
<value>Leadimporte</value>
</entry>
+ <entry>
+ <key>Invalid value</key>
+ <value>Ungültiger Wert</value>
+ </entry>
<entry>
<key>Caimpaignsteps</key>
<value>Kampagnenschritte</value>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 468e0fee73d0f2e3b3263cb589c418e5846951ff..083f0a7d6f388c4ef2561e165d9100bf6f025e90 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -8220,6 +8220,24 @@
<entry>
<key>Vacation</key>
</entry>
+ <entry>
+ <key>On Site</key>
+ </entry>
+ <entry>
+ <key>New child product</key>
+ </entry>
+ <entry>
+ <key>Communication: Link</key>
+ </entry>
+ <entry>
+ <key>Communication: Phone</key>
+ </entry>
+ <entry>
+ <key>Communication: Mail</key>
+ </entry>
+ <entry>
+ <key>Vacation</key>
+ </entry>
<entry>
<key>Price could not be determined</key>
</entry>
diff --git a/neonContext/Attribute/Attribute.aod b/neonContext/Attribute/Attribute.aod
index 749cae00feb54558e374c68bcbe98aa78a8c1877..46d59cc597f0e66fc980eb493a14384ea1434195 100644
--- a/neonContext/Attribute/Attribute.aod
+++ b/neonContext/Attribute/Attribute.aod
@@ -38,5 +38,8 @@
<name>1cf7d11d-d593-4518-b7aa-aca1a9a2fb8a</name>
<view>AttributeList_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>ba95c103-7e26-404d-868b-ed47521bb3bd</name>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonView/AttributeEdit_view/AttributeEdit_view.aod b/neonView/AttributeEdit_view/AttributeEdit_view.aod
index b044f7e623aeced5b67fa99ae4e45ec094e42e05..f579448f01e705bfc04adc4d4191199f94dddc93 100644
--- a/neonView/AttributeEdit_view/AttributeEdit_view.aod
+++ b/neonView/AttributeEdit_view/AttributeEdit_view.aod
@@ -41,6 +41,12 @@
</entityFieldLink>
</fields>
</genericViewTemplate>
+ <dynamicFormViewTemplate>
+ <name>ValidationParameters</name>
+ <formDefinition>VALIDATIONPARAMDEFINITION</formDefinition>
+ <formResult>VALIDATIONPARAMETERS</formResult>
+ <editMode v="true" />
+ </dynamicFormViewTemplate>
<neonViewReference>
<name>8387ef27-9565-400f-a0d5-ef1d2019b722</name>
<entityField>AttributeUsages</entityField>
diff --git a/process/Attribute_lib/process.js b/process/Attribute_lib/process.js
index e305be09e07503324dabc68aa704ea278037e92a..b6f4f0380639ea5cce991ad0f9fc62065b3c8cf5 100644
--- a/process/Attribute_lib/process.js
+++ b/process/Attribute_lib/process.js
@@ -806,19 +806,8 @@ AttributeRelationUtils.countAttributeRelations = function (pRowId, pObjectType,
* This Object is only for the general definition of attribute types and for getting
* data about every type, anything that has to do with a specific attribute (= the function requires an attribute id)
* should be done in AttributeUtils.
- * The required values and methods for each type are:
*
- * toString = function that should return a unique name
- * contentType = the value that is returned in the contentType process for the attribute
- * databaseField = the database field that holds values of attributes with the type
- *
- * optional:
- * getViewValue = function that gets the display value for a given value
- * getDropDownDefinitions = function that returns an array of possible values
- * for DROPDOWNDEFINITION
- * singleSelection = if true, the maximal usage count is always 1
- *
- * The display name is controlled by the keyword 'AttributeType'
+ * Every AttributeType also needs a keyword entry for the keyword container 'AttributeType'
*/
function AttributeTypes () {}
@@ -834,14 +823,152 @@ AttributeTypes.VOID = function () {return "VOID";}
AttributeTypes.MEMO = function () {return "MEMO";}
AttributeTypes.OBJECTSELECTION = function () {return "OBJECTSELECTION";}
AttributeTypes.THEME = function () {return "THEME";}
+AttributeTypes.INTEGER = function () {return "INTEGER";}
+
+/**
+ * Object for representing a single AttributeType. Note: The entries in AttributeTypes are not actually of this type, so "instanceof" will not
+ * work for them. The default properties of an attribute type are still initialized by calling this constructor, to make at least code
+ * completion possible.
+ */
+function AttributeType ()
+{
+ /**
+ * Returns a String representation of the AttributeType
+ *
+ * @return {String} String that matches the keyId of the AttributeType Keyword
+ */
+ this.toString = function () {return this();};
+ /**
+ * ContentType of the value field
+ */
+ this.contentType = null;
+ /**
+ * Database field that should hold the value
+ */
+ this.databaseField = null;
+ /**
+ * If set to true, max usage count is always 1 (optional)
+ */
+ this.singleSelection = false;
+ /**
+ * Array of attribute types that can have this attribute as parent (optional)
+ */
+ this.possibleChildren = null;
+ /**
+ * Name of the dropdowndefinition field (optional)
+ */
+ this.dropDownDefinitionTitle = "";
+ /**
+ * Use the lookup field
+ */
+ this.useLookup = false;
+ /**
+ * Function that returns an sub-sql to resolve the attribute display value (optional)
+ *
+ * @param {Object} pAttributeData Object with the attribute properties
+ * @return {String} sql expression that resolves the display value
+ */
+ this.getDisplayValueSql = function (pAttributeData)
+ {
+ return this.databaseField;
+ }
+ /**
+ * Function to resolve the display value (optional)
+ *
+ * @param {String} pValue raw value
+ * @return {String} the display value
+ */
+ this.getViewValue = function (pValue)
+ {
+ return pValue;
+ }
+ /**
+ * Function to load all possible values for "dropdowndefinition" (optional)
+ *
+ * @return {Array|null} array that can be used in the dropDownProcess (if defined)
+ */
+ this.getDropDownDefinitions = function ()
+ {
+ return null;
+ }
+ /**
+ * Function to define validation parameters that can be set for an attribute (optional)
+ *
+ * @return {Object[]} dynamicForm definition for the parameter fields
+ */
+ this.getValidationParameters = function () {},
+ /**
+ * Function to validate the entered attribute value (optional)
+ *
+ * @param {String} pValue the value to be validated
+ * @param {Object} pValidationParams validation parameters defined for the attribute
+ * @return {String|Boolean} A validation message string if the validation failed, true if the value is valid
+ */
+ this.validateValue = function (pValue, pValidationParams)
+ {
+ return true;
+ }
+}
+
+{ //block for encapsulation
+ for (let typeName in AttributeTypes)
+ {
+ AttributeType.call(AttributeTypes[typeName]);
+ }
+}
+
+//the "get" function is defined like this so it does not show up in for..in loops (enumerable: false)
+Object.defineProperty(AttributeTypes, "get", {
+ enumerable: false,
+ writable: true
+});
+/**
+ * Get the AttributeType object with the given name.
+ *
+ * @param {String} pAttributeTypeName name of the attribute type
+ * @return {AttributeType} the attribute type, or null if the given name was invalid
+ */
+AttributeTypes.get = function (pAttributeTypeName)
+{
+ if (!pAttributeTypeName)
+ return null;
+ return AttributeTypes[pAttributeTypeName.toString().trim()] || null;
+}
+
+/*** In the following section, custom properties are defined for every AttributeType ***/
Object.assign(AttributeTypes.TEXT, {
- toString: function () {return this();},
contentType: "TEXT",
- databaseField: "CHAR_VALUE"
+ databaseField: "CHAR_VALUE",
+ getValidationParameters: function ()
+ {
+ return [{
+ id: "regExp",
+ name: translate.text("Regular expression"),
+ contentType: "TEXT",
+ isReadable: true,
+ isWritable: true,
+ isRequired: false,
+ value: null
+ }];
+ },
+ validateValue: function (pValue, pValidationParams)
+ {
+ if (pValidationParams && pValidationParams.regExp)
+ {
+ var regExParts = pValidationParams.regExp.match(new RegExp('^/(.*?)/([gimy]*)$'));
+ var regEx;
+ if (regExParts)
+ regEx = new RegExp(regExParts[1], regExParts[2]);
+ else
+ regEx = new RegExp(pValidationParams.regExp);
+ if (!regEx.test(pValue))
+ return translate.text("Invalid value");
+ }
+ return true;
+ }
});
Object.assign(AttributeTypes.DATE, {
- toString: function () {return this();},
contentType: "DATE",
databaseField: "DATE_VALUE",
getViewValue: function (pValue)
@@ -850,12 +977,42 @@ Object.assign(AttributeTypes.DATE, {
}
});
Object.assign(AttributeTypes.NUMBER, {
- toString: function () {return this();},
contentType: "NUMBER",
- databaseField: "NUMBER_VALUE"
+ databaseField: "NUMBER_VALUE",
+ getValidationParameters: function ()
+ {
+ return [{
+ id: "minValue",
+ name: translate.text("Minimum"),
+ contentType: "NUMBER",
+ isReadable: true,
+ isWritable: true,
+ isRequired: false,
+ value: null
+ },{
+ id: "maxValue",
+ name: translate.text("Maximum"),
+ contentType: "NUMBER",
+ isReadable: true,
+ isWritable: true,
+ isRequired: false,
+ value: null
+ }];
+ },
+ validateValue: function (pValue, pValidationParams)
+ {
+ if (pValidationParams)
+ {
+ pValue = Number(pValue);
+ if (!Utils.isNullOrEmptyString(pValidationParams.minValue) && pValue < pValidationParams.minValue)
+ return translate.withArguments("Value is too small, the minimum is %0", [pValidationParams.minValue]);
+ if (!Utils.isNullOrEmptyString(pValidationParams.maxValue) && pValue > pValidationParams.maxValue)
+ return translate.withArguments("Value is too big, the maximum is %0", [pValidationParams.maxValue]);
+ }
+ return true;
+ }
});
Object.assign(AttributeTypes.BOOLEAN, {
- toString: function () {return this();},
contentType: "BOOLEAN",
databaseField: "INT_VALUE",
singleSelection: true,
@@ -871,7 +1028,6 @@ Object.assign(AttributeTypes.BOOLEAN, {
}
});
Object.assign(AttributeTypes.COMBO, {
- toString: function () {return this();},
contentType: "UNKNOWN",
databaseField: "ID_VALUE",
possibleChildren: [AttributeTypes.COMBOVALUE()],
@@ -901,15 +1057,7 @@ Object.assign(AttributeTypes.COMBO, {
return viewValue ? translate.text(viewValue) : viewValue;
}
});
-Object.assign(AttributeTypes.COMBOVALUE, {
- toString: function () {return this();},
- contentType: null,
- databaseField: null
-});
Object.assign(AttributeTypes.GROUP, {
- toString: function () {return this();},
- contentType: null,
- databaseField: null,
possibleChildren: [
AttributeTypes.GROUP(),
AttributeTypes.TEXT(),
@@ -925,7 +1073,6 @@ Object.assign(AttributeTypes.GROUP, {
]
});
Object.assign(AttributeTypes.KEYWORD, {
- toString: function () {return this();},
contentType: "UNKNOWN",
databaseField: "ID_VALUE",
getDisplayValueSql: function (pAttributeData)
@@ -947,21 +1094,17 @@ Object.assign(AttributeTypes.KEYWORD, {
}
});
Object.assign(AttributeTypes.VOID, {
- toString: function () {return this();},
- contentType: null,
- databaseField: null,
possibleChildren: [AttributeTypes.VOID()],
singleSelection: true
});
Object.assign(AttributeTypes.MEMO, {
- toString: function () {return this();},
contentType: "LONG_TEXT",
databaseField: "CHAR_VALUE"
});
Object.assign(AttributeTypes.OBJECTSELECTION, {
- toString: function () {return this();},
contentType: "UNKNOWN",
databaseField: "ID_VALUE",
+ useLookup: true,
getViewValue: function (pValue, pModule)
{
if (pValue)
@@ -1028,11 +1171,48 @@ Object.assign(AttributeTypes.OBJECTSELECTION, {
])
});
Object.assign(AttributeTypes.THEME, {
- toString: function () {return this();},
contentType: "LONG_TEXT",
databaseField: "CHAR_VALUE",
possibleChildren: [AttributeTypes.THEME()]
});
+Object.assign(AttributeTypes.INTEGER, {
+ contentType: "NUMBER",
+ databaseField: "INT_VALUE",
+ getValidationParameters: function ()
+ {
+ return [{
+ id: "minValue",
+ name: translate.text("Minimum"),
+ contentType: "NUMBER",
+ isReadable: true,
+ isWritable: true,
+ isRequired: false,
+ value: null
+ },{
+ id: "maxValue",
+ name: translate.text("Maximum"),
+ contentType: "NUMBER",
+ isReadable: true,
+ isWritable: true,
+ isRequired: false,
+ value: null
+ }];
+ },
+ validateValue: function (pValue, pValidationParams)
+ {
+ if (!Utils.isInteger(pValue))
+ return translate.text("Value must be an integer");
+ if (pValidationParams)
+ {
+ pValue = Number(pValue);
+ if (!Utils.isNullOrEmptyString(pValidationParams.minValue) && pValue < pValidationParams.minValue)
+ return translate.withArguments("Value is too small, the minimum is %0", [pValidationParams.minValue]);
+ if (!Utils.isNullOrEmptyString(pValidationParams.maxValue) && pValue > pValidationParams.maxValue)
+ return translate.withArguments("Value is too big, the maximum is %0", [pValidationParams.maxValue]);
+ }
+ return true;
+ }
+})
//reference for compatibility with old name
var $AttributeTypes = AttributeTypes;
@@ -1050,7 +1230,8 @@ function AttributeTypeUtil () {}
*/
AttributeTypeUtil.getContentType = function (pAttributeType)
{
- return AttributeTypeUtil._getProperty(pAttributeType, "contentType");
+ var type = AttributeTypes.get(pAttributeType);
+ return type ? type.contentType : null;
}
/**
@@ -1064,7 +1245,8 @@ AttributeTypeUtil.getContentType = function (pAttributeType)
*/
AttributeTypeUtil.isGroupType = function (pAttributeType)
{
- return !Utils.isNullOrEmpty(AttributeTypeUtil.getPossibleChildren(pAttributeType));
+ var type = AttributeTypes.get(pAttributeType);
+ return type && !Utils.isNullOrEmpty(type.possibleChildren);
}
/**
@@ -1081,7 +1263,8 @@ AttributeTypeUtil.isGroupType = function (pAttributeType)
*/
AttributeTypeUtil.getDatabaseField = function (pAttributeType)
{
- return AttributeTypeUtil._getProperty(pAttributeType, "databaseField");
+ var type = AttributeTypes.get(pAttributeType);
+ return type ? type.databaseField : null;
}
/**
@@ -1091,12 +1274,13 @@ AttributeTypeUtil.getDatabaseField = function (pAttributeType)
* The attribute type (use the values <br>
* of the AttributeTypes object, e. g.<br>
* AttributeTypes.TEXT)<br>
- * @return {String[]} <p>
- * The possible children types.<br>
+ * @return {String[]|null} <p>
+ * The possible children types, can be null.<br>
*/
AttributeTypeUtil.getPossibleChildren = function (pAttributeType)
{
- return AttributeTypeUtil._getProperty(pAttributeType, "possibleChildren");
+ var type = AttributeTypes.get(pAttributeType);
+ return type ? type.possibleChildren : null;
}
/**
@@ -1107,12 +1291,13 @@ AttributeTypeUtil.getPossibleChildren = function (pAttributeType)
* The attribute type (use the values<br>
* of the AttributeTypes object, e. g.<br>
* AttributeTypes.TEXT)<br>
- * @return {String[]} <p>
- * .<br>
+ * @return {Boolean} <p>
+ * if the attribute can only be used once<br>
*/
AttributeTypeUtil.isSingleSelection = function (pAttributeType)
{
- return AttributeTypeUtil._getProperty(pAttributeType, "singleSelection", false);
+ var type = AttributeTypes.get(pAttributeType);
+ return type ? type.singleSelection : null;
}
/**
@@ -1127,23 +1312,26 @@ AttributeTypeUtil.isSingleSelection = function (pAttributeType)
*/
AttributeTypeUtil.getDropDownDefinitionTitle = function (pAttributeType)
{
- return AttributeTypeUtil._getProperty(pAttributeType, "dropDownDefinitionTitle", "");
+ var type = AttributeTypes.get(pAttributeType);
+ return type ? type.dropDownDefinitionTitle : "";
}
+/**
+ * Returns a function to resolve the displayValue depending on the attribute type.
+ *
+ * @param {String} pAttributeType <p>
+ * The attribute type (use the values<br>
+ * of the AttributeTypes object, e. g.<br>
+ * AttributeTypes.TEXT)<br>
+ * @return {Function} <p>
+ * A function that resolves the displayValue or null if the type is invalid<br>
+ */
AttributeTypeUtil.getDisplayValueSqlFn = function (pAttributeType)
{
- if (!pAttributeType)
- return null;
-
- pAttributeType = pAttributeType.trim();
- var attributeType = AttributeTypes[pAttributeType];
+ var attributeType = AttributeTypes.get(pAttributeType);
if (!attributeType)
return null;
- var displayValueSqlFn = attributeType.getDisplayValueSql || function ()
- {
- return this.databaseField;
- };
- return displayValueSqlFn.bind(attributeType);
+ return attributeType.getDisplayValueSql.bind(attributeType);
}
/**
@@ -1152,14 +1340,15 @@ AttributeTypeUtil.getDisplayValueSqlFn = function (pAttributeType)
*
* @param {String} pAttributeType <p>
* The attribute type which shall be comapred.
- * @return {String} <p>
+ * @return {Boolean} <p>
* Returns true, if the given attribute type is equal<br>
* with the attribute string "OBJECTSELECTION" and <br>
* false, if not.<br>
*/
AttributeTypeUtil.useLookup = function (pAttributeType)
{
- return pAttributeType.trim() == AttributeTypes.OBJECTSELECTION();
+ var type = AttributeTypes.get(pAttributeType);
+ return type ? type.useLookup : false;
}
/**
@@ -1183,37 +1372,6 @@ AttributeTypeUtil.getGroupTypes = function (pChildType)
return groupTypes;
}
-/**
- * Returns the property matching to the property name.<br>
- *
- * @param {String} pAttributeType <p>
- * The corresponding attribute type to the<br>
- * property.
- * @param {String} pPropertyName <p>
- * The property name of the property.
- * @param {String} pDefaultValue <p>
- * Description.
- * @return <p>
- * Returns the property or null, when pAttributeType<br>
- * isn't filled or the given attribute type isn't in<br>
- * AttributeTypes. Otherwise the pDefaultValue,<br>
- * will be returned, case if it isn't undefined or null.<br>
- */
-AttributeTypeUtil._getProperty = function (pAttributeType, pPropertyName, pDefaultValue)
-{
- if (!pAttributeType)
- return null;
-
- pAttributeType = pAttributeType.trim();
- if (pAttributeType in AttributeTypes)
- if (pPropertyName in AttributeTypes[pAttributeType])
- return AttributeTypes[pAttributeType][pPropertyName];
- else
- return pDefaultValue === undefined ? null : pDefaultValue;
-
- return null;
-}
-
/**
* If the given attribute type is a <br>
* valid type and it has a getViewValue<br>
@@ -1231,9 +1389,8 @@ AttributeTypeUtil._getProperty = function (pAttributeType, pPropertyName, pDefau
*/
AttributeTypeUtil.getAttributeViewValue = function (pAttributeType, pValue, pKeyword)
{
- if (pAttributeType in AttributeTypes && AttributeTypes[pAttributeType].getViewValue)
- return AttributeTypes[pAttributeType].getViewValue(pValue, pKeyword);
- return pValue;
+ var type = AttributeTypes.get(pAttributeType);
+ return type ? type.getViewValue(pValue, pKeyword) : pValue;
}
/**
diff --git a/process/Util_lib/process.js b/process/Util_lib/process.js
index 10f2b630c4c66072046df07d331f3c77dd451493..8ea572643943a2724f7a323e207122ff530957de 100644
--- a/process/Util_lib/process.js
+++ b/process/Util_lib/process.js
@@ -52,6 +52,33 @@ Utils.isNullOrEmpty = function (pObject)
return pObject === null || pObject === undefined || Utils.isEmpty(pObject);
}
+/**
+ * Checks if the given value is null, undefined or "". This is useful for "has no value" checks where 0 and false
+ * should count as explicit values.
+ *
+ * @param {String} pValue the value to check
+ * @return {Boolean} true if the value is null, undefined or ""
+ */
+Utils.isNullOrEmptyString = function (pValue)
+{
+ return pValue === null || pValue === undefined || pValue === "";
+}
+
+/**
+ * Checks if the given value is not null, undefined or "". This is useful for "has value" checks where 0 and false
+ * should count as explicit values.
+ *
+ * @param {String} pValue the value to check
+ * @return {Boolean} true if the value is null, undefined or ""
+ * @example
+ *
+ * var filteredArray = myArray.filter(Utils.isNotNullOrEmptyString);
+ */
+Utils.isNotNullOrEmptyString = function (pValue)
+{
+ return pValue !== null && pValue !== undefined && pValue !== "";
+}
+
/**
* Creates a deep copy of the given object. Also works with arrays, maps and sets.
*