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

[Projekt: Entwicklung - Neon][TicketNr.: 1034996][Objectrelation]

parent 7b33b490
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 36 additions and 76 deletions
entity/ObjectRelation_entity/ObjectRelation_entity.aod
+ 1
− 4
View file @ 8e790768
......@@ -102,6 +102,7 @@
<consumer>KeywordObjectRelationType</consumer>
<searchable v="true" />
<groupable v="true" />
<displayValueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/relation_type/displayValueProcess.js</displayValueProcess>
</entityField>
<entityProvider>
<name>ObjectRelations</name>
......@@ -233,10 +234,6 @@
<name>RELATION_TYPE.value</name>
<recordfield>AB_OBJECTRELATION.RELATION_TYPE</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>RELATION_TYPE.displayValue</name>
<recordfield>AB_KEYWORD_ENTRY.TITLE</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
......
entity/ObjectRelation_entity/entityfields/otherobjectrowid/displayValueProcess.js
+ 2
− 1
View file @ 8e790768
......@@ -3,4 +3,5 @@ import("system.result");
import("system.vars");
import("Context_lib");
result.string(db.cell(ContextUtils.getNameSql(vars.get("$field.OtherObjectType"), vars.get("$field.OtherObjectRowid"))));
if (vars.exists("$field.OtherObjectType") && vars.get("$field.OtherObjectType") && (vars.exists("$field.OtherObjectRowid") && vars.get("$field.OtherObjectRowid")))
result.string(db.cell(ContextUtils.getNameSql(vars.get("$field.OtherObjectType"), vars.get("$field.OtherObjectRowid"))));
entity/ObjectRelation_entity/entityfields/otherobjectrowid/valueProcess.js
+ 2
− 2
View file @ 8e790768
......@@ -2,11 +2,11 @@ import("system.result");
import("system.vars");
var currentNum = vars.get("$field.CurrentObjectNumber");
if (currentNum == 1)
if (currentNum == "1")
{
result.string(vars.get("$field.OBJECT2_ROWID"));
}
else if (currentNum == 2)
else if (currentNum == "2")
{
result.string(vars.get("$field.OBJECT1_ROWID"));
}
\ No newline at end of file
entity/ObjectRelation_entity/entityfields/otherobjecttype/valueProcess.js
+ 2
− 2
View file @ 8e790768
......@@ -2,11 +2,11 @@ import("system.result");
import("system.vars");
var currentNum = vars.get("$field.CurrentObjectNumber");
if (currentNum == 1)
if (currentNum == "1")
{
result.string(vars.get("$field.OBJECT2_TYPE"));
}
else if (currentNum == 2)
else if (currentNum == "2")
{
result.string(vars.get("$field.OBJECT1_TYPE"));
}
\ No newline at end of file
entity/ObjectRelation_entity/entityfields/relation_type/displayValueProcess.js
+ 21
− 8
View file @ 8e790768
import("system.logging");
import("system.db");
import("system.result");
import("system.vars");
import("Context_lib");
import("Keyword_lib");
import("KeywordRegistry_basic");
var currentObjectNum = vars.get("$field.CurrentObjectNumber");
if (currentObjectNum == 1)
{
result.string(KeywordUtils);
}
else if (currentObjectNum == 2)
if (vars.exists("$field.OtherObjectType") && vars.get("$field.OtherObjectType") && (vars.exists("$field.OtherObjectRowid") && vars.get("$field.OtherObjectRowid")))
{
result.string("");
var attributes = KeywordUtils.getAttributeRelationsByKey(vars.get("$field.RELATION_TYPE"), $KeywordRegistry.objectRelationType());
var currentObjectNum = vars.get("$field.CurrentObjectNumber");
logging.log(currentObjectNum.toSource())
var name = "";
switch (currentObjectNum)
{
case "1":
name = attributes.Object2Title;
break;
case "2":
name = attributes.Object1Title;
break;
}
logging.log(attributes.toSource())
logging.log(name.toSource())
result.string(name);
}
\ No newline at end of file
entity/ObjectRelation_entity/recordcontainers/db/conditionProcess.js
+ 1
− 36
View file @ 8e790768
......@@ -23,39 +23,4 @@ if (vars.exists("$param.ObjectType_param") && vars.exists("$param.ObjectRowid_pa
}
/*
var anyObject = SqlCondition.begin()
.orSqlCondition(SqlCondition.begin()
.andPrepareVars("AB_OBJECTRELATION.OBJECT1_TYPE", "$param.AnyObjectType_param")
.andPrepareVars("AB_OBJECTRELATION.OBJECT1_ROWID", "$param.AnyObjectRowid_param"))
.orSqlCondition(SqlCondition.begin()
.andPrepareVars("AB_OBJECTRELATION.OBJECT2_TYPE", "$param.AnyObjectType_param")
.andPrepareVars("AB_OBJECTRELATION.OBJECT2_ROWID", "$param.AnyObjectRowid_param"));
var object1 = SqlCondition.begin()
.andPrepareVars("AB_OBJECTRELATION.OBJECT1_TYPE", "$param.Object1Type_param")
.andPrepareVars("AB_OBJECTRELATION.OBJECT1_ROWID", "$param.Object1Rowid_param");
var object2 = SqlCondition.begin()
.andPrepareVars("AB_OBJECTRELATION.OBJECT2_TYPE", "$param.Object2Type_param")
.andPrepareVars("AB_OBJECTRELATION.OBJECT2_ROWID", "$param.Object2Rowid_param");
var fullCondition = SqlCondition.begin();
switch (providerType)
{
case "both":
fullCondition.andSqlCondition(object1, "1=2")
.andSqlCondition(object2, "1=2");
break;
case "any":
fullCondition.orSqlCondition(anyObject);
break;
case "1":
fullCondition.orSqlCondition(object1);
case "2":
fullCondition.orSqlCondition(object2);
}
*/
result.string(db.translateCondition(fullCondition.build("1=2")) + "asdf");
\ No newline at end of file
result.string(db.translateCondition(fullCondition.build("1=2")));
\ No newline at end of file
neonView/ObjectRelationFilter_view/ObjectRelationFilter_view.aod
+ 2
− 18
View file @ 8e790768
......@@ -19,27 +19,11 @@
</neonTableColumn>
<neonTableColumn>
<name>99904354-1288-45c1-98cb-d40dcff310ce</name>
<entityField>TargetObjectType</entityField>
<entityField>OtherObjectType</entityField>
</neonTableColumn>
<neonTableColumn>
<name>654de038-0a31-4009-981a-efc2b5ded7ee</name>
<entityField>TargetObjectRowid</entityField>
</neonTableColumn>
<neonTableColumn>
<name>bf40dc74-cb41-422e-b6c3-c152264a42d7</name>
<entityField>OBJECT1_TYPE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>f3a15bc5-9ba2-44b9-a98a-7b66b90b0ee7</name>
<entityField>OBJECT1_ROWID</entityField>
</neonTableColumn>
<neonTableColumn>
<name>f199cbfa-d024-415d-aaee-daffe0ad7c59</name>
<entityField>OBJECT2_TYPE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>c61b81cb-e5b5-4872-979b-d088a41f9d7c</name>
<entityField>OBJECT2_ROWID</entityField>
<entityField>OtherObjectRowid</entityField>
</neonTableColumn>
</columns>
</tableViewTemplate>
......
neonView/PersonMain_view/PersonMain_view.aod
+ 5
− 5
View file @ 8e790768
......@@ -24,11 +24,6 @@
<entityField>Documents</entityField>
<view>DocumentFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>a713a58e-eae0-4657-9cb0-ffffbd41d4ab</name>
<entityField>ObjectRelations</entityField>
<view>ObjectRelationFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>0cb8f431-0377-45cb-a41b-a5716efb0fd0</name>
<entityField>Offers</entityField>
......@@ -39,6 +34,11 @@
<entityField>Contracts</entityField>
<view>ContractFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>a713a58e-eae0-4657-9cb0-ffffbd41d4ab</name>
<entityField>ObjectRelations</entityField>
<view>ObjectRelationFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>be48c6fe-1837-4c40-aef1-130fc1a5c544</name>
<entityField>Attributes</entityField>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment