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

[Projekt: Entwicklung - Neon][TicketNr.: 1024848][Umsetzung Modul... 

[Projekt: Entwicklung - Neon][TicketNr.: 1024848][Umsetzung Modul Vertriebsprojekt - Mitbewerber-Management]
parent 938876cd
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 355 additions and 158 deletions
aliasDefinition/Data_alias/Data_alias.aod
+ 42
− 42
View file @ ad63176b
......@@ -162,6 +162,48 @@
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>STRENGTH</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>WEAKNESS</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>PRICE_POLITICS</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
......@@ -3741,48 +3783,6 @@
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>STRENGTH</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>WEAKNESS</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>PRICE_POLITICS</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
......
entity/Org_entity/Org_entity.aod
+ 40
− 0
View file @ ad63176b
......@@ -328,6 +328,34 @@
<title>New offer</title>
<onActionProcess>%aditoprj%/entity/Org_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
</entityActionField>
<entityIncomingField>
<name>SalesprojectCompetitionOrg_dfi</name>
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
<name>f6e7b80e-64a9-4d4b-bbe7-dbb40bb35135</name>
<entityName>SalesprojectCompetition_entity</entityName>
<fieldName>SalesprojectCompetitionOrg_dfo</fieldName>
<isOutgoing v="false" />
</entityDependency>
</dependencies>
</entityIncomingField>
<entityField>
<name>PRICE_POLITICS</name>
<title>Price politics</title>
<possibleItemsProcess>%aditoprj%/entity/Org_entity/entityfields/price_politics/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
<name>STRENGTH</name>
<title>Strength</title>
<possibleItemsProcess>%aditoprj%/entity/Org_entity/entityfields/strength/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
<name>WEAKNESS</name>
<title>Weakness</title>
<possibleItemsProcess>%aditoprj%/entity/Org_entity/entityfields/weakness/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -424,6 +452,18 @@
<name>TYPE.value</name>
<recordfield>ORG.TYPE</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PRICE_POLITICS.value</name>
<recordfield>ORG.PRICE_POLITICS</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STRENGTH.value</name>
<recordfield>ORG.STRENGTH</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>WEAKNESS.value</name>
<recordfield>ORG.WEAKNESS</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
......
entity/Org_entity/recordcontainers/db/conditionProcess.js
+ 4
− 1
View file @ ad63176b
import("system.vars");
import("system.logging");
import("system.db");
import("system.result");
import("Sql_lib");
//TODO: use a preparedCondition when available
logging.log("--" + vars.get("$param.relationId_param"));
result.string(db.translateCondition(
SqlCondition.begin()
.andPrepareVars("ORG.RELATION_ID", "$param.relationId_param")
.andPrepareVars("ORG.ORGID", "$param.relationId_param")
.build("1 = 1")));
\ No newline at end of file
entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
+ 19
− 43
View file @ ad63176b
......@@ -85,24 +85,23 @@
<entityField>
<name>ORG_ORGID</name>
</entityField>
<entityField>
<name>PRICE_POLITICS</name>
<title>Price politics</title>
<possibleItemsProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/price_politics/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
<name>STRENGTH</name>
<title>Strength</title>
<possibleItemsProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/strength/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
<name>WEAKNESS</name>
<title>Weakness</title>
<possibleItemsProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/weakness/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
<name>RELATIONID</name>
</entityField>
<entityOutgoingField>
<name>SalesprojectCompetitionOrg_dfo</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Org_entity</entityName>
<fieldName>SalesprojectCompetitionOrg_dfi</fieldName>
</dependency>
<children>
<entityParameter>
<name>relationId_param</name>
<code>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/salesprojectcompetitionorg_dfi/children/relationid_param/code.js</code>
<expose v="true" />
<triggerRecalculation v="true" />
</entityParameter>
</children>
</entityOutgoingField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -112,26 +111,19 @@
<conditionProcess>%aditoprj%/entity/SalesprojectCompetition_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<linkInformation>
<linkInformation>
<name>f643212f-2cc4-4483-b457-4d4c2a4bc08c</name>
<name>03b7fdf5-e557-4818-9aae-3a30797814c4</name>
<tableName>SALESPROJECT_COMPETITION</tableName>
<primaryKey>SALESPROJECT_COMPETITIONID</primaryKey>
<isUIDTable v="true" />
<readonly v="false" />
</linkInformation>
<linkInformation>
<name>d7f7ca2e-e0f5-425f-b3a4-987bbdfe096e</name>
<name>dfbd027c-51e5-4ca6-8753-5a33759b5ec5</name>
<tableName>ORG</tableName>
<primaryKey>ORGID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
<linkInformation>
<name>b52fb6f7-d65c-4f95-abd9-606a159eede3</name>
<tableName>RELATION</tableName>
<primaryKey>RELATIONID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
</linkInformation>
<recordFieldMappings>
<dbRecordFieldMapping>
......@@ -158,10 +150,6 @@
<name>ORG_ORGID.value</name>
<recordfield>ORG.ORGID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PRICE_POLITICS.value</name>
<recordfield>SALESPROJECT_COMPETITION.PRICE_POLITICS</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>REASON.value</name>
<recordfield>SALESPROJECT_COMPETITION.REASON</recordfield>
......@@ -182,10 +170,6 @@
<name>STATUS.value</name>
<recordfield>SALESPROJECT_COMPETITION.STATUS</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STRENGTH.value</name>
<recordfield>SALESPROJECT_COMPETITION.STRENGTH</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>USER_EDIT.value</name>
<recordfield>SALESPROJECT_COMPETITION.USER_EDIT</recordfield>
......@@ -194,14 +178,6 @@
<name>USER_NEW.value</name>
<recordfield>SALESPROJECT_COMPETITION.USER_NEW</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>WEAKNESS.value</name>
<recordfield>SALESPROJECT_COMPETITION.WEAKNESS</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>RELATIONID.value</name>
<recordfield>RELATION.RELATIONID</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
......
entity/SalesprojectCompetition_entity/entityfields/salesprojectcompetitionorg_dfi/children/relationid_param/code.js 0 → 100644
+ 5
− 0
View file @ ad63176b
import("system.logging");
import("system.result");
import("system.vars");
logging.log(vars.get("$field.RELATION_ID"))
result.string(vars.get("$field.RELATION_ID"));
\ No newline at end of file
entity/SalesprojectCompetition_entity/recordcontainers/db/fromClauseProcess.js
+ 2
− 2
View file @ ad63176b
import("system.result");
result.string("SALESPROJECT_COMPETITION left join RELATION on (RELATION.RELATIONID = SALESPROJECT_COMPETITION.RELATION_ID) "
+ "left join ORG on (ORG.ORGID = RELATION.ORG_ID)");
\ No newline at end of file
result.string("SALESPROJECT_COMPETITION "
+ "left join ORG on (ORG.ORGID = SALESPROJECT_COMPETITION.RELATION_ID)");
\ No newline at end of file
neonContext/Org_context/Org_context.aod
+ 4
− 0
View file @ ad63176b
......@@ -28,5 +28,9 @@
<name>68c233a5-ac5a-4aa7-b795-cd5aeb7af2e6</name>
<view>OrgEdit_view</view>
</neonViewReference>
<neonViewReference>
<name>bb592f88-fa9f-4ecc-98cc-51a7903dc970</name>
<view>OrgAttr_view</view>
</neonViewReference>
</references>
</neonContext>
neonView/OrgAttr_view/OrgAttr_view.aod 0 → 100644
+ 33
− 0
View file @ ad63176b
<?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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
<name>OrgAttr_view</name>
<description>TODO: diese Felder als Attribute implementieren!!!</description>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
<name>layout</name>
</boxLayout>
</layout>
<children>
<genericViewTemplate>
<name>OrgAttributes</name>
<showDrawer v="true" />
<drawerCaption>Attributes</drawerCaption>
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>504f38a1-5642-42c5-9f43-cc20897330ec</name>
<entityField>PRICE_POLITICS</entityField>
</entityFieldLink>
<entityFieldLink>
<name>1c7a75d0-9032-4f63-8128-410d0c80dc0e</name>
<entityField>STRENGTH</entityField>
</entityFieldLink>
<entityFieldLink>
<name>8719c99b-89bb-472d-9596-109d921a1cf2</name>
<entityField>WEAKNESS</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
</children>
</neonView>
neonView/OrgPreview_view/OrgPreview_view.aod
+ 57
− 52
View file @ ad63176b
<?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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
<name>OrgPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
<name>layout</name>
</boxLayout>
</layout>
<children>
<cardViewTemplate>
<name>BasicCard_template</name>
<iconField>IMAGE</iconField>
<titleField>NAME</titleField>
<descriptionField>CUSTOMERCODE_DISPLAY_fieldGroup</descriptionField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<neonViewReference>
<name>2cb11b4e-dd8e-419b-8fff-ef0852ef2641</name>
<entityField>OrgComm_dfo</entityField>
<view>CommList_view</view>
</neonViewReference>
<neonViewReference>
<name>df605bb6-5d18-4233-abc0-1da82e4910ca</name>
<entityField>OrgAddress_dfo</entityField>
<view>AddressList_view</view>
</neonViewReference>
<genericViewTemplate>
<name>OrgInfo_template</name>
<showDrawer v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>4bad7219-1a3a-4e6e-ae5a-533d3acb6845</name>
<entityField>LANGUAGE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>5a397737-2768-4e16-8c58-890b8a26b4a2</name>
<entityField>STATUS</entityField>
</entityFieldLink>
<entityFieldLink>
<name>89e9aa74-1568-4f74-b42a-a02b13752802</name>
<entityField>TYPE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>180e8467-4eb2-4f89-a59f-ff76b8810925</name>
<entityField>INFO</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
</children>
</neonView>
<?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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
<name>OrgPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
<name>layout</name>
</boxLayout>
</layout>
<children>
<cardViewTemplate>
<name>BasicCard_template</name>
<iconField>IMAGE</iconField>
<titleField>NAME</titleField>
<descriptionField>CUSTOMERCODE_DISPLAY_fieldGroup</descriptionField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<neonViewReference>
<name>2cb11b4e-dd8e-419b-8fff-ef0852ef2641</name>
<entityField>OrgComm_dfo</entityField>
<view>CommList_view</view>
</neonViewReference>
<neonViewReference>
<name>df605bb6-5d18-4233-abc0-1da82e4910ca</name>
<entityField>OrgAddress_dfo</entityField>
<view>AddressList_view</view>
</neonViewReference>
<genericViewTemplate>
<name>OrgInfo_template</name>
<showDrawer v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>4bad7219-1a3a-4e6e-ae5a-533d3acb6845</name>
<entityField>LANGUAGE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>5a397737-2768-4e16-8c58-890b8a26b4a2</name>
<entityField>STATUS</entityField>
</entityFieldLink>
<entityFieldLink>
<name>89e9aa74-1568-4f74-b42a-a02b13752802</name>
<entityField>TYPE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>180e8467-4eb2-4f89-a59f-ff76b8810925</name>
<entityField>INFO</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
<neonViewReference>
<name>38e8188b-d6b8-4d2e-aad6-9e5ba4f2834a</name>
<entityField>#ENTITY</entityField>
<view>OrgAttr_view</view>
</neonViewReference>
</children>
</neonView>
neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod
+ 5
− 12
View file @ ad63176b
......@@ -30,19 +30,12 @@
<name>1c73d653-0734-4fc7-9965-5b4f35288e02</name>
<entityField>REASON</entityField>
</entityFieldLink>
<entityFieldLink>
<name>4975fb82-01a9-445e-ab36-d5dc23e6ab5a</name>
<entityField>PRICE_POLITICS</entityField>
</entityFieldLink>
<entityFieldLink>
<name>d3f070f2-8086-4dc3-a9ef-18dbef8c88a7</name>
<entityField>STRENGTH</entityField>
</entityFieldLink>
<entityFieldLink>
<name>fbd6742c-1480-4be6-9d96-a37fa835a6c6</name>
<entityField>WEAKNESS</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
<neonViewReference>
<name>3ad88e2c-b159-4c97-b81f-beb689b0fc1c</name>
<entityField>SalesprojectCompetitionOrg_dfo</entityField>
<view>OrgAttr_view</view>
</neonViewReference>
</children>
</neonView>
others/db_changes/data/example_org/ORG_gfk.xml
+ 3
− 0
View file @ ad63176b
......@@ -8,6 +8,9 @@
<column name="NAME" value="Gfk AG"/>
<column name="CUSTOMERCODE" value="00000001"/>
<column name="TYPE" valueNumeric="0"/>
<column name="PRICE_POLITICS" valueNumeric="1"/>
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
<insert tableName="RELATION">
<column name="RELATIONID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
......
others/db_changes/data/example_org/ORG_kaeltetechnik.xml
+ 3
− 0
View file @ ad63176b
......@@ -7,6 +7,9 @@
<column name="CUSTOMERCODE" value="00000004"/>
<column name="DATE_NEW" valueDate="2018-09-14T03:03:43"/>
<column name="USER_NEW" value="admin"/>
<column name="PRICE_POLITICS" valueNumeric="1"/>
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
<insert tableName="RELATION">
<column name="RELATIONID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
......
others/db_changes/data/example_org/ORG_lichtenstein.xml
+ 3
− 0
View file @ ad63176b
......@@ -7,6 +7,9 @@
<column name="CUSTOMERCODE" value="00000003"/>
<column name="DATE_NEW" valueDate="2018-09-13T03:03:43"/>
<column name="USER_NEW" value="admin"/>
<column name="PRICE_POLITICS" valueNumeric="1"/>
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
<insert tableName="RELATION">
<column name="RELATIONID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
......
others/db_changes/data/example_org/ORG_mass.xml
+ 123
− 0
View file @ ad63176b
This diff is collapsed.
others/db_changes/data/example_org/ORG_mnf.xml
+ 3
− 0
View file @ ad63176b
......@@ -7,6 +7,9 @@
<column name="CUSTOMERCODE" value="00000002"/>
<column name="DATE_NEW" valueDate="2018-09-12T03:03:43"/>
<column name="USER_NEW" value="admin"/>
<column name="PRICE_POLITICS" valueNumeric="1"/>
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
<insert tableName="RELATION">
<column name="RELATIONID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
......
others/db_changes/data/example_org/ORG_pichelmaier.xml
+ 3
− 0
View file @ ad63176b
......@@ -7,6 +7,9 @@
<column name="CUSTOMERCODE" value="00000005"/>
<column name="DATE_NEW" valueDate="2018-09-15T03:03:43"/>
<column name="USER_NEW" value="admin"/>
<column name="PRICE_POLITICS" valueNumeric="1"/>
<column name="STRENGTH" valueNumeric="1"/>
<column name="WEAKNESS" valueNumeric="1"/>
</insert>
<insert tableName="RELATION">
<column name="RELATIONID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
......
others/db_changes/data/example_org/ORG_privat.xml
+ 6
− 6
View file @ ad63176b
......@@ -2,12 +2,12 @@
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="t.feldmann" id="efc15d2-a20d-49e0-a24c-afab6095d1cb">
<insert tableName="ORG">
<column name="ORGID" value="0"/>
<column name="USER_NEW" value="admin"/>
<column name="DATE_NEW" valueDate="2018-06-13T09:03:43"/>
<column name="NAME" value="privat"/>
<column name="CUSTOMERCODE" value=""/>
<column name="TYPE" valueNumeric="0"/>
<ccolumn name="ORGID" value="0"/>
<column name="USER_NEW" value="admin"/>
<column name="DATE_NEW" valueDate="2018-06-13T09:03:43"/>
<column name="NAME" value="privat"/>
<column name="CUSTOMERCODE" value=""/>
<column name="TYPE" valueNumeric="0"/>
</insert>
<rollback>
<delete tableName="ORG">
......
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