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

Object relation fixes

parent 61e4ffd5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 61 additions and 53 deletions
entity/ObjectRelation_entity/ObjectRelation_entity.aod
+ 1
− 0
View file @ 2a5c73d5
......@@ -25,6 +25,7 @@
<linkedContextProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object1_rowid/linkedContextProcess.js</linkedContextProcess>
<stateProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object1_rowid/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object1_rowid/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object1_rowid/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>AB_OBJECTRELATIONID</name>
......
entity/ObjectRelation_entity/entityfields/object1_rowid/displayValueProcess.js 0 → 100644
+ 28
− 0
View file @ 2a5c73d5
import("system.logging");
import("system.neon");
import("system.vars");
import("system.result");
import("system.db");
import("Context_lib");
var recordstate = vars.get("$sys.recordstate");
if (recordstate == neon.OPERATINGSTATE_NEW)
{
if (vars.exists("$param.AnyObjectRowid_param") && vars.get("$param.AnyObjectRowid_param"))
{
result.string(db.cell(ContextUtils.getNameSql(vars.get("$param.AnyObjectType_param"), vars.get("$param.AnyObjectRowid_param"))));
}
else if (vars.exists("$param.Object1Rowid_param") && vars.get("$param.Object1Rowid_param"))
{
result.string(vars.get("$param.Object1Rowid_param"));
}
}
else if (recordstate == neon.OPERATINGSTATE_EDIT)
{
logging.log("edit")
if (vars.exists("$field.OBJECT1_ROWID") && vars.get("$field.OBJECT1_ROWID") && vars.exists("$field.OBJECT1_TYPE") && vars.get("$field.OBJECT1_TYPE"))
{
logging.log(db.cell(ContextUtils.getNameSql(vars.get("$field.OBJECT1_TYPE"), vars.get("$field.OBJECT1_ROWID"))))
result.string(db.cell(ContextUtils.getNameSql(vars.get("$field.OBJECT1_TYPE"), vars.get("$field.OBJECT1_ROWID"))));
}
}
\ No newline at end of file
entity/ObjectRelation_entity/entityfields/object1_type/displayValueProcess.js
+ 11
− 5
View file @ 2a5c73d5
import("system.logging");
import("system.result");
import("system.neon");
import("system.vars");
import("system.project");
var recordstate = vars.get("$sys.recordstate");
if (recordstate == neon.OPERATINGSTATE_NEW || recordstate == neon.OPERATINGSTATE_EDIT)
if (recordstate == neon.OPERATINGSTATE_NEW)
{
if (vars.exists("$param.AnyObjectType_param") && vars.get("$param.AnyObjectType_param"))
{
logging.log(vars.get("$param.AnyObjectType_param"));
result.string("disp: " + vars.get("$param.AnyObjectType_param"));
result.string(project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$param.AnyObjectType_param"))[1]);
}
else if (vars.exists("$param.Object1Type_param") && vars.get("$param.Object1Type_param"))
{
result.string("disp: " + vars.get("$param.Object1Type_param"));
result.string(project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$param.Object1Type_param"))[1]);
}
}
else
{
if (vars.exists("$field.OBJECT1_TYPE") && vars.get("$field.OBJECT1_TYPE"))
{
result.string(project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$field.OBJECT1_TYPE"))[1]);
}
}
\ No newline at end of file
entity/ObjectRelation_entity/entityfields/object1_type/valueProcess.js
+ 1
− 3
View file @ 2a5c73d5
import("system.logging");
import("system.result");
import("system.neon");
import("system.vars");
var recordstate = vars.get("$sys.recordstate");
if (recordstate == neon.OPERATINGSTATE_NEW || recordstate == neon.OPERATINGSTATE_EDIT)
if (recordstate == neon.OPERATINGSTATE_NEW)
{
if (vars.exists("$param.AnyObjectType_param") && vars.get("$param.AnyObjectType_param"))
{
logging.log(vars.get("$param.AnyObjectType_param"));
result.string(vars.get("$param.AnyObjectType_param"));
}
else if (vars.exists("$param.Object1Type_param") && vars.get("$param.Object1Type_param"))
......
entity/ObjectRelation_entity/entityfields/object2_type/displayValueProcess.js
+ 3
− 14
View file @ 2a5c73d5
import("system.project");
import("system.result");
import("system.neon");
import("system.vars");
import("system.project");
var recordstate = vars.get("$sys.recordstate");
if (recordstate == neon.OPERATINGSTATE_NEW || recordstate == neon.OPERATINGSTATE_EDIT)
{
if (vars.exists("$param.Object1Type_param") && vars.get("$param.Object1Type_param"))
{
// TODO: maybe use the Context_entity when jdito can call other entities over consumers.
result.string(project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$param.Object1Type_param"))[1]);
}
}
else
if (vars.exists("$field.OBJECT2_TYPE") && vars.get("$field.OBJECT2_TYPE"))
{
if (vars.get("$field.OBJECT1_TYPE"))
result.string(project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$field.OBJECT1_TYPE"))[1]);
result.string(project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$field.OBJECT2_TYPE"))[1]);
}
\ No newline at end of file
entity/ObjectRelation_entity/entityfields/object2_type/valueProcess.js
+ 1
− 1
View file @ 2a5c73d5
......@@ -3,7 +3,7 @@ import("system.neon");
import("system.vars");
var recordstate = vars.get("$sys.recordstate");
if (recordstate == neon.OPERATINGSTATE_NEW || recordstate == neon.OPERATINGSTATE_EDIT)
if (recordstate == neon.OPERATINGSTATE_NEW)
{
if (vars.exists("$param.Object2Type_param") && vars.get("$param.Object2Type_param"))
{
......
entity/ObjectRelation_entity/entityfields/objects1/children/objecttype_param/code.js
+ 1
− 1
View file @ 2a5c73d5
......@@ -2,5 +2,5 @@ import("system.logging");
import("system.vars");
import("system.result");
logging.log("type: " + vars.get("$field.OBJECT1_TYPE"))
logging.log("set type: " + vars.get("$field.OBJECT1_TYPE"))
result.string(vars.get("$field.OBJECT1_TYPE"))
\ No newline at end of file
entity/ObjectRelation_entity/entityfields/objects2/children/objecttype_param/code.js
+ 1
− 3
View file @ 2a5c73d5
import("system.logging");
import("system.vars");
import("system.result");
logging.log("type2: " + vars.get("$field.OBJECT1_TYPE"))
result.string(vars.get("$field.OBJECT1_TYPE"))
\ No newline at end of file
result.string(vars.get("$field.OBJECT2_TYPE"))
\ No newline at end of file
entity/Object_entity/Object_entity.aod
+ 6
− 0
View file @ 2a5c73d5
......@@ -2,6 +2,7 @@
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0">
<name>Object_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<titleProcess>%aditoprj%/entity/Object_entity/titleProcess.js</titleProcess>
<recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
......@@ -29,6 +30,8 @@
<entityParameter>
<name>ObjectRowId_param</name>
<expose v="true" />
<triggerRecalculation v="true" />
<mandatory v="false" />
<description>PARAMETER</description>
</entityParameter>
<entityProvider>
......@@ -53,11 +56,13 @@
<entityParameter>
<name>ObjectRowId_param</name>
<expose v="true" />
<triggerRecalculation v="true" />
<mandatory v="true" />
</entityParameter>
<entityParameter>
<name>ObjectType_param</name>
<expose v="true" />
<triggerRecalculation v="true" />
<mandatory v="true" />
</entityParameter>
</children>
......@@ -89,6 +94,7 @@
<entityParameter>
<name>ObjectType_param</name>
<expose v="true" />
<triggerRecalculation v="true" />
<mandatory v="true" />
</entityParameter>
</children>
......
entity/Object_entity/recordcontainers/jdito/contentProcess.js
+ 3
− 12
View file @ 2a5c73d5
......@@ -3,26 +3,17 @@ import("system.vars");
import("system.logging");
import("system.result");
import("Context_lib");
logging.log("huuihuihihi");
logging.log(vars.get("$param.ObjectType_param").toSource())
if (vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param"))
{
if (vars.exists("$param.ObjectRowId_param") && vars.get("$param.ObjectRowId_param"))
{
logging.log(vars.get("$param.ObjectType_param"))
logging.log(ContextUtils.getContextDataSql(vars.get("$param.ObjectType_param"), vars.get("$param.ObjectRowId_param")))
logging.log(db.table(vars.get("$param.ObjectRowId_param"), ContextUtils.getContextDataSql(vars.get("$param.ObjectType_param"), vars.get("$param.ObjectRowId_param"))).toSource())
result.object(db.table(vars.get("$param.ObjectRowId_param"), ContextUtils.getContextDataSql(vars.get("$param.ObjectType_param"), vars.get("$param.ObjectRowId_param"))));
} else {
logging.log(vars.get("$param.ObjectType_param").toSource())
}
logging.log(ContextUtils.getContextDataSql(vars.get("$param.ObjectType_param")))
logging.log(db.table(ContextUtils.getContextDataSql(vars.get("$param.ObjectType_param"))).toSource())
result.object(db.table(ContextUtils.getContextDataSql(vars.get("$param.ObjectType_param"))))
} else {
logging.log(vars.get("$param.ObjectType_param").toSource())
logging.log(vars.get("$param.ObjectRowId_param").toSource())
result.object([]);
}
entity/Object_entity/titleProcess.js 0 → 100644
+ 4
− 0
View file @ 2a5c73d5
import("system.vars");
import("system.result");
result.string(vars.get("$field.TITLE"))
\ No newline at end of file
process/Context_lib/process.js
+ 1
− 14
View file @ 2a5c73d5
......@@ -36,19 +36,6 @@ ContextUtils.getContextName = function(pContextId)
return pContextId;
}
/**
* Get all contexts of the project.
*
* @return {String[][]} [ ["contextid", "contextName" ], [..., ...], ...]
*/
ContextUtils.getContexts = function()
{
// TODO: The name is currently also the id. This may change.
return project.getDataModelNames(project.DATAMODEL_KIND_CONTEXT).map(function(contextName) {
return [contextName, ContextUtils.getContextName(contextName)];
});
}
/**
* TODO: !!!temporary function until you can get fields from another Entity!!!
*/
......@@ -93,7 +80,7 @@ ContextUtils.getNameSubselectSql = function(pContextIdDbField, pRowIdDbField)
ContextUtils.getNameSql = function(pContextId, pRowId)
{
var selectMap = ContextUtils._getSelectMap()
return SqlCondition.begin().andPrepare(selectMap[pContextId][1] + "." + selectMap[pContextId][2], pRowId).buildSql("select " + selectMap[contextId][0] + " from " + selectMap[contextId][1], "1=2");
return SqlCondition.begin().andPrepare(selectMap[pContextId][1] + "." + selectMap[pContextId][2], pRowId).buildSql("select " + selectMap[pContextId][0] + " from " + selectMap[pContextId][1], "1=2");
}
/**
......
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