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

Revert "wip" 

This reverts commit 21e9dbb3.
parent d0ea5d5a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 6 additions and 252 deletions
entity/Context_entity/Context_entity.aod deleted 100644 → 0
+ 0
− 40
View file @ d0ea5d5a
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.1.1">
<name>Context_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<titleProcess>%aditoprj%/entity/Context_entity/titleProcess.js</titleProcess>
<recordContainer>jdito</recordContainer>
<entityFields>
<entityIncomingField>
<name>#INCOMING</name>
<recordContainer>jdito</recordContainer>
<dependencies>
<entityDependency>
<name>40037d07-01a3-474a-aaf6-875aaf250bbf</name>
<entityName>ObjectRelation_entity</entityName>
<fieldName>Context_dfo</fieldName>
<isOutgoing v="false" />
</entityDependency>
</dependencies>
</entityIncomingField>
<entityField>
<name>UID</name>
<title>Context id</title>
</entityField>
<entityField>
<name>CONTEXT_NAME</name>
<title>Context name</title>
</entityField>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
<name>jdito</name>
<jDitoRecordAlias>Data_alias</jDitoRecordAlias>
<contentProcess>%aditoprj%/entity/Context_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
<recordFields>
<element>UID.value</element>
<element>CONTEXT_NAME.value</element>
</recordFields>
</jDitoRecordContainer>
</recordContainers>
</entity>
entity/Context_entity/recordcontainers/jdito/contentProcess.js deleted 100644 → 0
+ 0
− 11
View file @ d0ea5d5a
import("system.result");
import("system.project");
import("system.logging");
import("Context_lib");
var contextNames = project.getDataModelNames(project.DATAMODEL_KIND_CONTEXT);
// var contextModels = project.getDataModels(project.DATAMODEL_KIND_CONTEXT, contextNames);
result.object(contextNames.map(function(contextName) {
return [contextName, ContextUtils.getContextName(contextName)];
}));
\ No newline at end of file
entity/Context_entity/titleProcess.js deleted 100644 → 0
+ 0
− 4
View file @ d0ea5d5a
import("system.vars");
import("system.result");
result.string(vars.get("$field.CONTEXT_NAME"))
\ No newline at end of file
entity/ObjectRelation_entity/ObjectRelation_entity.aod
+ 4
− 25
View file @ 288cc240
......@@ -12,17 +12,11 @@
<entityField>
<name>OBJECT1_TYPE</name>
<title>Type 1</title>
<outgoingField>Context_dfo</outgoingField>
<stateProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object1_type/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object1_type/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object1_type/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>OBJECT1_ROWID</name>
<title>Object 1</title>
<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>
</entityField>
<entityField>
<name>AB_OBJECTRELATIONID</name>
......@@ -53,16 +47,10 @@
<name>OBJECT2_ROWID</name>
<title>Object 2</title>
<linkedContextProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object2_rowid/linkedContextProcess.js</linkedContextProcess>
<stateProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object2_rowid/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object2_rowid/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>OBJECT2_TYPE</name>
<title>Type 2</title>
<linkedContext>Context_context</linkedContext>
<outgoingField>Context_dfo</outgoingField>
<stateProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object2_type/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object2_type/valueProcess.js</valueProcess>
</entityField>
<entityParameter>
<name>Object1Type_param</name>
......@@ -243,19 +231,19 @@
<children>
<entityParameter>
<name>Object1Rowid_param</name>
<expose v="true" />
<expose v="false" />
</entityParameter>
<entityParameter>
<name>Object1Type_param</name>
<expose v="true" />
<expose v="false" />
</entityParameter>
<entityParameter>
<name>Object2Rowid_param</name>
<expose v="true" />
<expose v="false" />
</entityParameter>
<entityParameter>
<name>Object2Type_param</name>
<expose v="true" />
<expose v="false" />
</entityParameter>
<entityParameter>
<name>AnyObjectRowid_param</name>
......@@ -267,15 +255,6 @@
</entityParameter>
</children>
</entityIncomingField>
<entityOutgoingField>
<name>Context_dfo</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Context_entity</entityName>
<fieldName>#INCOMING</fieldName>
</dependency>
</entityOutgoingField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......
entity/ObjectRelation_entity/entityfields/object1_rowid/stateProcess.js deleted 100644 → 0
+ 0
− 14
View file @ d0ea5d5a
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 ((vars.exists("$param.AnyObjectRowid_param") && vars.get("$param.AnyObjectRowid_param"))
|| (vars.exists("$param.Object1Rowid_param") && vars.get("$param.Object1Rowid_param")))
{
result.string(neon.COMPONENTSTATE_READONLY);
}
}
\ No newline at end of file
entity/ObjectRelation_entity/entityfields/object1_rowid/valueProcess.js deleted 100644 → 0
+ 0
− 16
View file @ d0ea5d5a
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 (vars.exists("$param.AnyObjectRowid_param") && vars.get("$param.AnyObjectRowid_param"))
{
result.string(vars.get("$param.AnyObjectRowid_param"));
}
else if (vars.exists("$param.Object1Rowid_param") && vars.get("$param.Object1Rowid_param"))
{
result.string(vars.get("$param.Object1Rowid_param"));
}
}
\ No newline at end of file
entity/ObjectRelation_entity/entityfields/object1_type/displayValueProcess.js deleted 100644 → 0
+ 0
− 18
View file @ d0ea5d5a
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 (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"));
}
else if (vars.exists("$param.Object1Type_param") && vars.get("$param.Object1Type_param"))
{
result.string("disp: " + vars.get("$param.Object1Type_param"));
}
}
\ No newline at end of file
entity/ObjectRelation_entity/entityfields/object1_type/stateProcess.js deleted 100644 → 0
+ 0
− 13
View file @ d0ea5d5a
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 ((vars.exists("$param.AnyObjectType_param") && vars.get("$param.AnyObjectType_param"))
|| (vars.exists("$param.Object1Type_param") && vars.get("$param.Object1Type_param")))
{
result.string(neon.COMPONENTSTATE_READONLY);
}
}
\ No newline at end of file
entity/ObjectRelation_entity/entityfields/object1_type/valueProcess.js deleted 100644 → 0
+ 0
− 18
View file @ d0ea5d5a
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 (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"))
{
result.string(vars.get("$param.Object1Type_param"));
}
}
\ No newline at end of file
entity/ObjectRelation_entity/entityfields/object2_rowid/stateProcess.js deleted 100644 → 0
+ 0
− 12
View file @ d0ea5d5a
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)
{
logging.log(vars.exists("$param.Object2Rowid_param") && vars.get("$param.Object2Rowid_param"))
if (vars.exists("$param.Object2Rowid_param") && vars.get("$param.Object2Rowid_param"))
result.string(neon.COMPONENTSTATE_READONLY);
}
\ No newline at end of file
entity/ObjectRelation_entity/entityfields/object2_rowid/valueProcess.js deleted 100644 → 0
+ 0
− 12
View file @ d0ea5d5a
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 (vars.exists("$param.Object2Rowid_param") && vars.get("$param.Object2Rowid_param"))
{
result.string(vars.get("$param.Object2Rowid_param"));
}
}
\ No newline at end of file
entity/ObjectRelation_entity/entityfields/object2_type/stateProcess.js deleted 100644 → 0
+ 0
− 10
View file @ d0ea5d5a
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 (vars.exists("$param.Object2Type_param") && vars.get("$param.Object2Type_param"))
result.string(neon.COMPONENTSTATE_READONLY);
}
\ No newline at end of file
entity/ObjectRelation_entity/entityfields/object2_type/valueProcess.js deleted 100644 → 0
+ 0
− 12
View file @ d0ea5d5a
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 (vars.exists("$param.Object2Type_param") && vars.get("$param.Object2Type_param"))
{
result.string(vars.get("$param.Object2Type_param"));
}
}
\ No newline at end of file
entity/ObjectRelation_entity/recordcontainers/db/recordfieldmappings/object1_rowid.displayvalue/expression.js
+ 0
− 1
View file @ 288cc240
import("system.result");
import("Context_lib");
// TODO: no subselect?
result.string(ContextUtils.getNameSubselectSql("OBJECT1_TYPE", "OBJECT1_ROWID"))
\ No newline at end of file
entity/ObjectRelation_entity/recordcontainers/db/recordfieldmappings/object2_rowid.displayvalue/expression.js
+ 0
− 1
View file @ 288cc240
import("system.result");
import("Context_lib");
// TODO: no subselect?
result.string(ContextUtils.getNameSubselectSql("OBJECT2_TYPE", "OBJECT2_ROWID"))
\ No newline at end of file
entity/Pers_entity/Pers_entity.aod
+ 1
− 0
View file @ 288cc240
......@@ -513,6 +513,7 @@
<children>
<entityParameter>
<name>AnyObjectRowid_param</name>
<title></title>
<code>%aditoprj%/entity/Pers_entity/entityfields/objectrelation_dfo/children/anyobjectrowid_param/code.js</code>
</entityParameter>
<entityParameter>
......
entity/Pers_entity/entityfields/objectrelation_dfo/children/anyobjecttype_param/code.js
+ 1
− 1
View file @ 288cc240
import("system.result");
import("Context_lib");
result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
result.string(ContextUtils.getCurrentContextId())
\ No newline at end of file
neonContext/Context_context/Context_context.aod deleted 100644 → 0
+ 0
− 13
View file @ d0ea5d5a
<?xml version="1.0" encoding="UTF-8"?>
<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
<name>Context_context</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<lookupview>ContextLookup_view</lookupview>
<entity>Context_entity</entity>
<references>
<neonViewReference>
<name>3eedbcba-63f3-4825-852a-ab8269343e9a</name>
<view>ContextLookup_view</view>
</neonViewReference>
</references>
</neonContext>
neonContext/ObjectRelation_context/ObjectRelation_context.aod
+ 0
− 5
View file @ 288cc240
......@@ -3,7 +3,6 @@
<name>ObjectRelation_context</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterview>ObjectRelationFilter_view</filterview>
<editview>ObjectRelationEdit_view</editview>
<preview>ObjectRelationPreview_view</preview>
<entity>ObjectRelation_entity</entity>
<references>
......@@ -15,9 +14,5 @@
<name>dc0bd793-a472-4a7b-8394-06c4bc31258a</name>
<view>ObjectRelationPreview_view</view>
</neonViewReference>
<neonViewReference>
<name>3b480346-0cf4-44ee-9422-1693b386aa86</name>
<view>ObjectRelationEdit_view</view>
</neonViewReference>
</references>
</neonContext>
neonView/ContextLookup_view/ContextLookup_view.aod deleted 100644 → 0
+ 0
− 26
View file @ d0ea5d5a
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
<name>ContextLookup_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
<name>layout</name>
</boxLayout>
</layout>
<children>
<tableViewTemplate>
<name>contexts</name>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
<name>a748ea55-7c16-4b09-81f3-0bf88674e18a</name>
<entityField>UID</entityField>
</neonTableColumn>
<neonTableColumn>
<name>e3178147-3010-48e2-b23c-022e1badc3f7</name>
<entityField>CONTEXT_NAME</entityField>
</neonTableColumn>
</columns>
</tableViewTemplate>
</children>
</neonView>
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