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

fix activity-relations

parent f9ba323c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 43 additions and 27 deletions
entity/ActivityLink_entity/ActivityLink_entity.aod
+ 10
− 17
View file @ 41688b6b
......@@ -10,9 +10,11 @@
</entityProvider>
<entityField>
<name>ACTIVITYLINKID</name>
<valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/activitylinkid/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>OBJECT_TYPE</name>
<title>Object type</title>
<consumer>Contexts</consumer>
<linkedContext>Context</linkedContext>
<displayValueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
......@@ -22,22 +24,12 @@
<title>Beziehung</title>
<consumer>Objects</consumer>
<linkedContextProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/object_rowid/linkedContextProcess.js</linkedContextProcess>
<displayValueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/object_rowid/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>ACTIVITY_ID</name>
<valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/activity_id/valueProcess.js</valueProcess>
</entityField>
<entityParameter>
<name>ObjectRowid_param</name>
<expose v="true" />
<triggerRecalculation v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityParameter>
<name>ObjectType_param</name>
<expose v="true" />
<triggerRecalculation v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityProvider>
<name>Link</name>
<fieldType>DEPENDENCY_IN</fieldType>
......@@ -54,11 +46,7 @@
</dependencies>
<children>
<entityParameter>
<name>ObjectRowid_param</name>
<expose v="true" />
</entityParameter>
<entityParameter>
<name>ObjectType_param</name>
<name>ActivityId_param</name>
<expose v="true" />
</entityParameter>
</children>
......@@ -88,6 +76,11 @@
<fieldName>#PROVIDER</fieldName>
</dependency>
</entityConsumer>
<entityParameter>
<name>ActivityId_param</name>
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
......
entity/ActivityLink_entity/entityfields/activity_id/valueProcess.js 0 → 100644
+ 4
− 0
View file @ 41688b6b
import("system.vars");
import("system.result");
result.string(vars.get("$param.ActivityId_param"))
\ No newline at end of file
entity/ActivityLink_entity/entityfields/activitylinkid/valueProcess.js 0 → 100644
+ 7
− 0
View file @ 41688b6b
import("system.util");
import("system.vars");
import("system.result");
import("system.neon");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
result.string(util.getNewUUID());
\ No newline at end of file
entity/ActivityLink_entity/entityfields/object_rowid/displayValueProcess.js 0 → 100644
+ 7
− 0
View file @ 41688b6b
import("system.vars");
import("system.db");
import("system.result");
import("Context_lib");
if (vars.exists("$field.OBJECT_TYPE") && vars.get("$field.OBJECT_TYPE"))
result.string(db.cell(ContextUtils.getNameSql(vars.get("$field.OBJECT_TYPE"), vars.get("$field.OBJECT_ROWID"))));
\ No newline at end of file
entity/ActivityLink_entity/recordcontainers/db/conditionProcess.js
+ 6
− 3
View file @ 41688b6b
import("system.logging");
import("system.vars");
import("system.db");
import("system.result");
import("Sql_lib");
logging.log("GET: " + vars.get("$param.ActivityId_param"))
var cond = SqlCondition.begin()
.andPrepareVars("ACTIVITYLINK.OBJECT_ROWID", "$param.ObjectRowid_param")
.andPrepareVars("ACTIVITYLINK.OBJECT_TYPE", "$param.ObjectType_param");
.andPrepareVars("ACTIVITYLINK.ACTIVITY_ID", "$param.ActivityId_param");
//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
result.string(db.translateCondition(cond.build("1 = 0")));
\ No newline at end of file
entity/Activity_entity/Activity_entity.aod
+ 3
− 7
View file @ 41688b6b
......@@ -147,7 +147,6 @@
</entityField>
<entityParameter>
<name>ActivityId_param</name>
<expose v="true" />
<mandatory v="false" />
<description>PARAMETER</description>
</entityParameter>
......@@ -184,12 +183,9 @@
</dependency>
<children>
<entityParameter>
<name>ObjectRowid_param</name>
<code>%aditoprj%/entity/Activity_entity/entityfields/links/children/objectrowid_param/code.js</code>
</entityParameter>
<entityParameter>
<name>ObjectType_param</name>
<code>%aditoprj%/entity/Activity_entity/entityfields/links/children/objecttype_param/code.js</code>
<name>ActivityId_param</name>
<code>%aditoprj%/entity/Activity_entity/entityfields/links/children/activityid_param/code.js</code>
<expose v="true" />
</entityParameter>
</children>
</entityConsumer>
......
entity/Activity_entity/entityfields/links/children/activityid_param/code.js 0 → 100644
+ 4
− 0
View file @ 41688b6b
import("system.vars");
import("system.result");
result.string(vars.get("$field.ACTIVITYID"));
\ No newline at end of file
entity/Activity_entity/recordcontainers/db/conditionProcess.js
+ 1
− 0
View file @ 41688b6b
......@@ -9,6 +9,7 @@ if (vars.exists("$param.RowId_param") && vars.get("$param.RowId_param") && vars.
var activityLinkCond = SqlCondition.begin().andPrepareVars("ACTIVITYLINK.OBJECT_ROWID", "$param.RowId_param")
.andPrepareVars("ACTIVITYLINK.OBJECT_TYPE", "$param.ObjectId_param");
// TODO: more performant way than IN. Maybe a join??
cond.and(db.translateStatement(activityLinkCond.buildSql("ACTIVITY.ACTIVITYID in (select ACTIVITYLINK.ACTIVITY_ID from ACTIVITYLINK", "1=2", ")")))
}
......
neonView/ActivityLinkFilter_view/ActivityLinkFilter_view.aod
+ 1
− 0
View file @ 41688b6b
......@@ -11,6 +11,7 @@
<children>
<tableViewTemplate>
<name>ActivityLinkFilter_template</name>
<autoNewRow v="true" />
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
......
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