diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod index 686f3b79597aee7ac09d6e36811d01e75117a84c..c7f4fd219afb5c37341a0bf6d75f657fd5a50bf2 100644 --- a/entity/Person_entity/Person_entity.aod +++ b/entity/Person_entity/Person_entity.aod @@ -50,7 +50,6 @@ <name>SALUTATION</name> <title>Salutation</title> <possibleItemsProcess>%aditoprj%/entity/Person_entity/entityfields/salutation/possibleItemsProcess.js</possibleItemsProcess> - <onValidation>%aditoprj%/entity/Person_entity/entityfields/salutation/onValidation.js</onValidation> <onValueChange>%aditoprj%/entity/Person_entity/entityfields/salutation/onValueChange.js</onValueChange> <onValueChangeTypes> <element>MASK</element> diff --git a/entity/Person_entity/entityfields/gender/displayValueProcess.js b/entity/Person_entity/entityfields/gender/displayValueProcess.js index 1d84f0ff41f8372c2c39f60b9beadd11fd88c60c..2c6be04351d31f0c022e0bf9f14aa1985a729810 100644 --- a/entity/Person_entity/entityfields/gender/displayValueProcess.js +++ b/entity/Person_entity/entityfields/gender/displayValueProcess.js @@ -1,32 +1,23 @@ +import("system.logging"); import("system.vars"); import("Keyword_lib"); -import("system.logging"); import("system.result"); import("system.db"); import("system.vars"); import("system.neon"); +import("Sql_lib"); var salutation = vars.get("$field.SALUTATION"); +var cond = SqlCondition.begin() + +var sex = db.cell(cond.andPrepareVars("SALUTATION.SALUTATION", "$field.SALUTATION").buildSql("select SEX from SALUTATION", "1=2")) -if (salutation) -{ - var sex = db.cell("select SEX from SALUTATION where SALUTATION = '" + salutation + "'"); - - if (sex) - { - var keyword = KeywordUtils.getViewValue("PersonGender", sex); - - logging.log("ii" + keyword) - result.string(keyword) - } +if (sex) +{ + var keyword = KeywordUtils.getViewValue("PersonGender", sex); -} - - - - - - - + logging.log(keyword) + result.string(keyword) +} \ No newline at end of file diff --git a/entity/Person_entity/entityfields/gender/valueProcess.js b/entity/Person_entity/entityfields/gender/valueProcess.js index 56881cd1bb4c4e966f4862a066ef5b412b0b005d..9d763fea86f10f390de8a5fd38d6398bc827d677 100644 --- a/entity/Person_entity/entityfields/gender/valueProcess.js +++ b/entity/Person_entity/entityfields/gender/valueProcess.js @@ -1,19 +1,11 @@ -import("system.logging"); import("system.result"); import("system.db"); import("system.vars"); import("system.neon"); +import("Sql_lib"); -var salutation = vars.get("$field.SALUTATION") -; +var cond = SqlCondition.begin() -logging.log("value process: " + salutation); +var sex = db.cell(cond.andPrepareVars("SALUTATION.SALUTATION", "$field.SALUTATION").buildSql("select SEX from SALUTATION", "1=2")) -if((vars.get("sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("sys.recordstate") == neon.OPERATINGSTATE_EDIT) && !vars.get("$field.GENDER") && vars.get("$field.SALUTATION")) -{ - -var sex = db.cell("select SEX from SALUTATION where SALUTATION = '" + salutation + "'"); -logging.log(sex) -result.string( sex) - -} \ No newline at end of file +result.string(sex) \ No newline at end of file diff --git a/entity/Person_entity/entityfields/salutation/onValidation.js b/entity/Person_entity/entityfields/salutation/onValidation.js deleted file mode 100644 index 25929f20e02a67ac78244dc320e2676f173babfb..0000000000000000000000000000000000000000 --- a/entity/Person_entity/entityfields/salutation/onValidation.js +++ /dev/null @@ -1,14 +0,0 @@ -//import("system.logging"); -//import("system.result"); -//import("system.db"); -//import("system.vars"); -// -//var salutation = vars.get("$field.SALUTATION") -// -//if(!vars.get("$field.GENDER")) -// { -// -// var sex = db.cell("select SEX from SALUTATION where SALUTATION = '" + salutation + "'"); -// vars.set("$field.GENDER", sex) -// -// } \ No newline at end of file diff --git a/entity/Person_entity/entityfields/salutation/possibleItemsProcess.js b/entity/Person_entity/entityfields/salutation/possibleItemsProcess.js index c494b91dba12f54a31bc55ca4f683c8ec01a4863..9fc8e487f3507eee6ac040962c6da113cfab659d 100644 --- a/entity/Person_entity/entityfields/salutation/possibleItemsProcess.js +++ b/entity/Person_entity/entityfields/salutation/possibleItemsProcess.js @@ -2,7 +2,6 @@ import("system.result"); import("system.db"); -//var salutation = db.array(db.COLUMN, "select distinct SALUTATION from SALUTATION where SALUTATION is not NULL"); -var salutation2 = db.table("select distinct SALUTATION, SALUTATION from SALUTATION where SALUTATION is not NULL"); +var salutation = db.table("select distinct SALUTATION, SALUTATION from SALUTATION where SALUTATION is not NULL"); -result.object(salutation2); \ No newline at end of file +result.object(salutation); \ No newline at end of file diff --git a/entity/Person_entity/entityfields/title/possibleItemsProcess.js b/entity/Person_entity/entityfields/title/possibleItemsProcess.js index b5456c01035eb280f74eaa5a2562e3b0c7049df6..c1f2d5c8ff4573d475585e71f007f01846b3da1a 100644 --- a/entity/Person_entity/entityfields/title/possibleItemsProcess.js +++ b/entity/Person_entity/entityfields/title/possibleItemsProcess.js @@ -1,13 +1,10 @@ -import("system.logging"); import("system.vars"); import("system.result"); import("system.db"); +import("Sql_lib"); -var salutation = vars.get("$field.SALUTATION"); +var cond = SqlCondition.begin() -logging.log(salutation) - -var title = db.table("select TITLE, TITLE from SALUTATION where TITLE is not null and SALUTATION = '" + salutation + "'"); - -result.object(title); +var title = db.table(cond.andPrepareVars("SALUTATION.SALUTATION", "$field.SALUTATION").buildSql("select TITLE, TITLE from SALUTATION", "1=2")) +result.object(title); \ No newline at end of file