diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod index e127be7bea92f4bea3f62516f96f09267db2084a..1c5af54df2cc56fb5df9d0a99566b7428614c7d6 100644 --- a/entity/Person_entity/Person_entity.aod +++ b/entity/Person_entity/Person_entity.aod @@ -49,7 +49,6 @@ <name>SALUTATION</name> <title>Salutation</title> <consumer>Salutations</consumer> - <possibleItemsProcess>%aditoprj%/entity/Person_entity/entityfields/salutation/possibleItemsProcess.js</possibleItemsProcess> <displayValueProcess>%aditoprj%/entity/Person_entity/entityfields/salutation/displayValueProcess.js</displayValueProcess> </entityField> <entityField> diff --git a/entity/Person_entity/entityfields/salutation/displayValueProcess.js b/entity/Person_entity/entityfields/salutation/displayValueProcess.js index 23500893ccea7156b46f5f0c46d85341ff55189d..e7bc31ecaedcd80e517b146a0ceb1b42ec52b8e8 100644 --- a/entity/Person_entity/entityfields/salutation/displayValueProcess.js +++ b/entity/Person_entity/entityfields/salutation/displayValueProcess.js @@ -1,7 +1,7 @@ -import("system.vars"); -import("system.db"); -import("system.result"); -import("Sql_lib"); - -var cond = SqlCondition.begin() -result.string(db.cell(cond.andPrepareVars("PERSON.PERSONID", "$field.PERSONID").buildSql("select SALUTATION from PERSON", "1=2"))); \ No newline at end of file +//import("system.vars"); +//import("system.db"); +//import("system.result"); +//import("Sql_lib"); +// +//var cond = SqlCondition.begin() +//result.string(db.cell(cond.andPrepareVars("PERSON.PERSONID", "$field.PERSONID").buildSql("select SALUTATION from PERSON", "1=2"))); \ No newline at end of file diff --git a/entity/Person_entity/entityfields/salutation/possibleItemsProcess.js b/entity/Person_entity/entityfields/salutation/possibleItemsProcess.js deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/entity/Salutation_entity/Salutation_entity.aod b/entity/Salutation_entity/Salutation_entity.aod index 9a1e05fce95881d0d4aa76e7e37f3cc01d781753..0ac244944ff3bc85e0ae74f2f0e50c86a79fa3e5 100644 --- a/entity/Salutation_entity/Salutation_entity.aod +++ b/entity/Salutation_entity/Salutation_entity.aod @@ -4,11 +4,10 @@ <title>Anrede</title> <majorModelMode>DISTRIBUTED</majorModelMode> <titleProcess>%aditoprj%/entity/Salutation_entity/titleProcess.js</titleProcess> - <recordContainer>distinctSalutation_jdito</recordContainer> + <recordContainer>db</recordContainer> <entityFields> <entityProvider> <name>#PROVIDER</name> - <recordContainer>db</recordContainer> </entityProvider> <entityField> <name>SALUTATIONID</name> @@ -88,6 +87,11 @@ <expose v="true" /> <triggerRecalculation v="true" /> </entityParameter> + <entityParameter> + <name>retval</name> + <code>%aditoprj%/entity/Salutation_entity/entityfields/salutations/children/retval/code.js</code> + <expose v="false" /> + </entityParameter> </children> </entityProvider> <entityProvider> @@ -104,6 +108,12 @@ <isConsumer v="false" /> </entityDependency> </dependencies> + <children> + <entityParameter> + <name>retval</name> + <expose v="false" /> + </entityParameter> + </children> </entityProvider> <entityParameter> <name>Language_param</name> @@ -130,6 +140,14 @@ <mandatory v="false" /> <description>PARAMETER</description> </entityParameter> + <entityField> + <name>DISTINCT_RETVAL</name> + </entityField> + <entityParameter> + <name>retval</name> + <expose v="true" /> + <description>PARAMETER</description> + </entityParameter> </entityFields> <recordContainers> <dbRecordContainer> @@ -207,5 +225,8 @@ <element>UID.value</element> </recordFields> </jDitoRecordContainer> + <jDitoRecordContainer> + <name>distinctAny</name> + </jDitoRecordContainer> </recordContainers> </entity> diff --git a/entity/Salutation_entity/entityfields/salutations/children/retval/code.js b/entity/Salutation_entity/entityfields/salutations/children/retval/code.js new file mode 100644 index 0000000000000000000000000000000000000000..c03d064f10c76ac2f0674946bfcd1d4cd9d5f482 --- /dev/null +++ b/entity/Salutation_entity/entityfields/salutations/children/retval/code.js @@ -0,0 +1,2 @@ +import("system.result"); +result.string("salutation") \ No newline at end of file diff --git a/entity/Salutation_entity/recordcontainers/distinctsalutation_jdito/contentProcess.js b/entity/Salutation_entity/recordcontainers/distinctsalutation_jdito/contentProcess.js index bc7f9eb2ad3a5f8b85ab5b8731cb21ad0ee4cee4..bdebb34ec8ccb88c31892dc8d282e16bf5dc6b6b 100644 --- a/entity/Salutation_entity/recordcontainers/distinctsalutation_jdito/contentProcess.js +++ b/entity/Salutation_entity/recordcontainers/distinctsalutation_jdito/contentProcess.js @@ -1,9 +1,10 @@ +import("system.logging"); import("system.vars"); import("system.result"); import("system.db"); import("Sql_lib"); - +logging.log("salutation") var cond = SqlCondition.begin() .and("SALUTATION is not NULL") .andPrepareVars("SALUTATION.LANGUAGE", "$param.Language_param") diff --git a/entity/Salutation_entity/recordcontainers/title_jdito/contentProcess.js b/entity/Salutation_entity/recordcontainers/title_jdito/contentProcess.js index 76ec7bc49b0fc680576a6f4d69a58b99fc7f0319..c875f3fbbb090dc2cf2a5b80537e073971e41887 100644 --- a/entity/Salutation_entity/recordcontainers/title_jdito/contentProcess.js +++ b/entity/Salutation_entity/recordcontainers/title_jdito/contentProcess.js @@ -1,9 +1,10 @@ +import("system.logging"); import("system.vars"); import("system.result"); import("system.db"); import("Sql_lib"); - +logging.log("title") var cond = SqlCondition.begin() .and("TITLE is not NULL")