Skip to content
Snippets Groups Projects
Commit 3f3facb2 authored by Johannes Hörmann's avatar Johannes Hörmann
Browse files

fix salutation

parent 62e3edab
No related branches found
No related tags found
No related merge requests found
Showing
with 35 additions and 38 deletions
......@@ -52,12 +52,6 @@
<title>Salutation</title>
<consumer>Salutations</consumer>
<displayValueProcess>%aditoprj%/entity/Person_entity/entityfields/salutation/displayValueProcess.js</displayValueProcess>
<onValueChange>%aditoprj%/entity/Person_entity/entityfields/salutation/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
<element>PROCESS</element>
<element>RECORD</element>
</onValueChangeTypes>
</entityField>
<entityField>
<name>TITLE</name>
......@@ -199,10 +193,6 @@
<description>This parameter is used for specifing a related &amp;quot;CONTACTID&amp;quot; to a COMMUNICATION-entry.
Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
</entityParameter>
<entityParameter>
<name>CommCategory_param</name>
<description>TODO: expose auf false. aktuell wird der Code nicht ausgef�hrt, wenn Expose false ist.</description>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
......@@ -314,8 +304,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<onValueChange>%aditoprj%/entity/Person_entity/entityfields/language/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
<element>PROCESS</element>
<element>RECORD</element>
</onValueChangeTypes>
</entityField>
<entityConsumer>
......@@ -779,6 +767,14 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<name>LANGUAGE.displayValue</name>
<expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>SALUTATION.displayValue</name>
<expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/salutation.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>TITLE.displayValue</name>
<expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/title.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
......
......@@ -7,5 +7,5 @@ if((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.re
neon.setFieldValue("$field.SALUTATION", "");
neon.setFieldValue("$field.TITLE", "");
neon.refresh(["$field.SALUTATION", "$field.TITLE"]);
//neon.refresh(["$field.SALUTATION", "$field.TITLE"]);
}
\ 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
import("system.result");
import("system.neon");
import("system.vars");
if((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT))
{
if (!vars.get("$field.SALUTATION"))
result.string("")
}
\ No newline at end of file
import("system.vars");
import("system.neon");
if((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT))
{
neon.setFieldValue("$field.TITLE", "");
neon.refresh(["$field.TITLE"]);
}
\ 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 TITLE from PERSON", "1=2")));
\ No newline at end of file
import("system.result");
import("system.neon");
import("system.vars");
if((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT))
{
if (!vars.get("$field.TITLE"))
result.string("")
}
\ No newline at end of file
import("system.result");
result.string("SALUTATION");
\ No newline at end of file
import("system.result");
result.string("TITLE");
\ No newline at end of file
......@@ -6,4 +6,4 @@ import("Sql_lib");
result.object(db.table(SqlCondition.begin()
.and("SALUTATION is not NULL")
.andPrepareVars("SALUTATION.LANGUAGE", "$param.Language_param")
.buildSql("select distinct SALUTATION from SALUTATION", "1=2")));
\ No newline at end of file
.buildSql("select distinct SALUTATION from SALUTATION", "1=1")));
\ No newline at end of file
......@@ -7,4 +7,4 @@ result.object(db.table(SqlCondition.begin()
.and("TITLE is not NULL")
.andPrepareVars("SALUTATION.SALUTATION", "$param.Salutation_param")
.andPrepareVars("SALUTATION.LANGUAGE", "$param.Language_param")
.buildSql("select distinct TITLE from SALUTATION", "1=2")));
\ No newline at end of file
.buildSql("select distinct TITLE from SALUTATION", "1=1")));
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment