Skip to content
Snippets Groups Projects
Commit c38a1f33 authored by S.Listl's avatar S.Listl
Browse files

AttributeRelation and Communication changes

parent 53b0e464
No related branches found
No related tags found
No related merge requests found
Showing
with 37 additions and 17 deletions
......@@ -33,15 +33,15 @@
<valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/object_type/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>ATTRIBUTERELATION_VALUE</name>
<name>valueProxy</name>
<title>Value</title>
<contentTypeProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/attributerelation_value/contentTypeProcess.js</contentTypeProcess>
<contentTypeProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/valueproxy/contentTypeProcess.js</contentTypeProcess>
<resolution>DAY</resolution>
<mandatory v="true" />
<possibleItemsProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/attributerelation_value/possibleItemsProcess.js</possibleItemsProcess>
<valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/attributerelation_value/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/attributerelation_value/displayValueProcess.js</displayValueProcess>
<onValueChange>%aditoprj%/entity/AttributeRelation_entity/entityfields/attributerelation_value/onValueChange.js</onValueChange>
<possibleItemsProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/valueproxy/possibleItemsProcess.js</possibleItemsProcess>
<valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/valueproxy/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/valueproxy/displayValueProcess.js</displayValueProcess>
<onValueChange>%aditoprj%/entity/AttributeRelation_entity/entityfields/valueproxy/onValueChange.js</onValueChange>
</entityField>
<entityField>
<name>CHAR_VALUE</name>
......
......@@ -21,6 +21,6 @@ else if (attrType == $AttributeTypes.KEYWORD)
}
else
value = vars.get("$field.ATTRIBUTERELATION_VALUE");
value = vars.get("$field.valueProxy");
result.string(value);
......@@ -2,7 +2,7 @@ import("system.vars");
import("Entity_lib");
import("Attribute_lib");
var attrValue = vars.exists("$field.ATTRIBUTERELATION_VALUE") ? vars.get("$field.ATTRIBUTERELATION_VALUE") : "";
var attrValue = vars.exists("$field.valueProxy") ? vars.get("$field.valueProxy") : "";
attrValue = ProcessHandlingUtils.getOnValidationValue(attrValue);
var attribute = AttributeHandler.begin(vars.get("$field.AB_ATTRIBUTE_ID"));
......
......@@ -17,6 +17,13 @@ if (attrType == $AttributeTypes.COMBO)
var valueList = db.table(valueSql);
result.object(valueList);
}
else if (attrType == $AttributeTypes.BOOLEAN)
{
result.object([
["1", translate.text("Yes")],
["0", translate.text("No")]
]);
}
//TODO this is a workaround for keywords, when it's possible to use the consumer remove this
else if (attrType == $AttributeTypes.KEYWORD)
......@@ -34,4 +41,4 @@ else if (attrType == $AttributeTypes.KEYWORD)
return [row[0], translate.text(row[1])];
});
result.object(keywords);
}
}
\ No newline at end of file
......@@ -4,10 +4,9 @@ import("system.result");
import("Attribute_lib");
var fieldState;
if (vars.get("$field.ATTRIBUTE_TYPE") == $AttributeTypes.KEYWORD)
if (vars.get("$field.ATTRIBUTE_TYPE") == $AttributeTypes.KEYWORD || true) //TODO use the correct condition when updating the state is possible
fieldState = neon.COMPONENTSTATE_AUTO;
else
fieldState = neon.COMPONENTSTATE_INVISIBLE;
//TODO result the correct state here when updating the state is possible
result.string(neon.COMPONENTSTATE_AUTO);//result.string(fieldState);
\ No newline at end of file
result.string(fieldState);
\ No newline at end of file
......@@ -23,6 +23,12 @@
<title>Medium</title>
<consumer>KeywordMedium</consumer>
<mandatory v="true" />
<onValueChange>%aditoprj%/entity/Communication_entity/entityfields/medium_id/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
<element>PROCESS</element>
<element>RECORD</element>
</onValueChangeTypes>
</entityField>
<entityField>
<name>CONTACT_ID</name>
......
import("system.neon");
import("system.vars");
import("Entity_lib");
var mediumId = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.MEDIUM_ID"));
if (mediumId == "d08956b8-369e-4b65-88fa-1c37b3368ae3" && vars.get("$field.ADDR") == "") //medium == Internet
neon.setFieldValue("$field.ADDR", "https://");
\ No newline at end of file
......@@ -411,14 +411,14 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<name>STANDARD_EMAIL_COMMUNICATION</name>
<title>E-Mail</title>
<consumer>EmailCommunications</consumer>
<searchable v="false" />
<searchable v="true" />
<onValueChange>%aditoprj%/entity/Person_entity/entityfields/standard_email_communication/onValueChange.js</onValueChange>
</entityField>
<entityField>
<name>STANDARD_PHONE_COMMUNICATION</name>
<title>Phone</title>
<consumer>PhoneCommunications</consumer>
<searchable v="false" />
<searchable v="true" />
<onValueChange>%aditoprj%/entity/Person_entity/entityfields/standard_phone_communication/onValueChange.js</onValueChange>
</entityField>
<entityConsumer>
......
......@@ -18,7 +18,7 @@
</neonTableColumn>
<neonTableColumn>
<name>04dda499-d970-41d1-a524-5e354c0d2bfd</name>
<entityField>ATTRIBUTERELATION_VALUE</entityField>
<entityField>valueProxy</entityField>
</neonTableColumn>
</columns>
</genericMultipleViewTemplate>
......
......@@ -21,7 +21,7 @@
</neonTableColumn>
<neonTableColumn>
<name>83a10d52-9eaf-4901-935e-2a7410831861</name>
<entityField>ATTRIBUTERELATION_VALUE</entityField>
<entityField>valueProxy</entityField>
</neonTableColumn>
</columns>
</tableViewTemplate>
......
......@@ -18,7 +18,7 @@
</neonTableColumn>
<neonTableColumn>
<name>a4661c55-6e51-4884-b460-0ef1dca7c5f7</name>
<entityField>ATTRIBUTERELATION_VALUE</entityField>
<entityField>valueProxy</entityField>
</neonTableColumn>
</columns>
</titledListViewTemplate>
......
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