Skip to content
Snippets Groups Projects
Commit 6f94f51b authored by A.Voegl's avatar A.Voegl
Browse files

Merge origin/KeywordMigration into KeywordMigration

parents c24adc6d 92619adc
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 246 deletions
entity/KeywordEntry_entity/KeywordEntry_entity.aod
+ 0
− 6
View file @ 6f94f51b
......@@ -312,12 +312,6 @@
<fieldName>KeywordStrenght</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>35298a2b-6d6a-4af8-817d-1647068fe1fa</name>
<entityName>Salesproject_entity</entityName>
<fieldName>KeywordEstimation</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>6e2d164c-1ac7-4ed0-ad8f-7bfda1328493</name>
<entityName>Salesproject_entity</entityName>
......
entity/Salesproject_entity/Salesproject_entity.aod
+ 0
− 23
View file @ 6f94f51b
......@@ -378,21 +378,6 @@
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>KeywordEstimation</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
<children>
<entityParameter>
<name>containerName_param</name>
<code>%aditoprj%/entity/Salesproject_entity/entityfields/keywordestimation/children/containername_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>KeywordState</name>
<fieldType>DEPENDENCY_OUT</fieldType>
......@@ -538,10 +523,6 @@
<name>PROBABILITY.displayValue</name>
<expression>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/probability.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ESTIMATIONVALUE.displayValue</name>
<expression>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/estimationvalue.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STATE.displayValue</name>
<expression>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/state.displayvalue/expression.js</expression>
......@@ -550,10 +531,6 @@
<name>PHASE.displayValue</name>
<expression>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ESTIMATION.displayValue</name>
<expression>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/estimation.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
......
entity/Salesproject_entity/entityfields/keywordestimation/children/containername_param/code.js deleted 100644 → 0
+ 0
− 5
View file @ c24adc6d
import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
result.string($KeywordRegistry.salesprojectEstimation());
\ No newline at end of file
entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/estimation.displayvalue/expression.js deleted 100644 → 0
+ 0
− 6
View file @ c24adc6d
import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectEstimation(), "SALESPROJECT.ESTIMATIONVALUE");
result.string(sql);
\ No newline at end of file
entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/estimationvalue.displayvalue/expression.js deleted 100644 → 0
+ 0
− 6
View file @ c24adc6d
import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectEstimation(), "SALESPROJECT.ESTIMATIONVALUE");
result.string(sql);
\ No newline at end of file
others/db_changes/data_alias/basic/2019.2/AditoBasic/init_SalesprojectEstimation.xml deleted 100644 → 0
+ 0
− 183
View file @ c24adc6d
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<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="a.veogl" id="616f99aa-2067-43a4-b2cf-a642fe00e84d">
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="0a1dd1ed-800b-4b1d-a253-7936dac95a9d"/>
<column name="KEYID" value="c6c49da4-80dc-4c32-b5b0-c33eac27de7f"/>
<column name="TITLE" value="Project_volume sufficient"/>
<column name="CONTAINER" value="SalesprojectEstimation"/>
<column name="SORTING" valueNumeric="1"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="1d670df0-ab0e-45b6-85b8-d1ae4439da70"/>
<column name="KEYID" value="9237ee74-bb91-4333-8114-4485b35cf8d7"/>
<column name="TITLE" value="Project_budget available"/>
<column name="CONTAINER" value="SalesprojectEstimation"/>
<column name="SORTING" valueNumeric="2"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="0c7250da-a8ec-4509-98f4-660ad671837a"/>
<column name="KEYID" value="e3e16d06-1390-4d84-81bd-c495a401cc70"/>
<column name="TITLE" value="Project_specifications available"/>
<column name="CONTAINER" value="SalesprojectEstimation"/>
<column name="SORTING" valueNumeric="3"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="a5fb241b-0818-41b7-ae4f-939c2aa0b112"/>
<column name="KEYID" value="2ef3ac7d-72b8-43b3-9cc1-64ffdf43fe2f"/>
<column name="TITLE" value="Project_timeframe critical"/>
<column name="CONTAINER" value="SalesprojectEstimation"/>
<column name="SORTING" valueNumeric="4"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="6c932def-573d-409c-94b7-3e8640f2bdc6"/>
<column name="KEYID" value="4b322f3f-815e-442e-ac63-a983f3efca6b"/>
<column name="TITLE" value="Project_payment default/penalty critical"/>
<column name="CONTAINER" value="SalesprojectEstimation"/>
<column name="SORTING" valueNumeric="5"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="9f00cf54-d28b-4d77-a828-791c6d336d41"/>
<column name="KEYID" value="3179371b-b647-4141-b575-3c26ce9f9213"/>
<column name="TITLE" value="Project_references available"/>
<column name="CONTAINER" value="SalesprojectEstimation"/>
<column name="SORTING" valueNumeric="6"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="f7d55e39-1600-4a74-bfac-c6298e527e2d"/>
<column name="KEYID" value="3088256a-f247-40cb-ad4e-33892cbf5ca3"/>
<column name="TITLE" value="Product_requirements suitable"/>
<column name="CONTAINER" value="SalesprojectEstimation"/>
<column name="SORTING" valueNumeric="7"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="819d7bf1-1248-435d-9131-8faaae0a4a37"/>
<column name="KEYID" value="a2faa45e-bc7a-41f6-8130-7c7a636ddc9f"/>
<column name="TITLE" value="Product_philosophy fitting"/>
<column name="CONTAINER" value="SalesprojectEstimation"/>
<column name="SORTING" valueNumeric="8"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="74828345-edb0-47b4-aa80-1bc956021f43"/>
<column name="KEYID" value="d2e97e88-77fd-4fdb-8d5e-30807e2a40e2"/>
<column name="TITLE" value="Product_industry template available"/>
<column name="CONTAINER" value="SalesprojectEstimation"/>
<column name="SORTING" valueNumeric="9"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="57defed0-4545-40c9-bbd0-3014511332fc"/>
<column name="KEYID" value="87fd87af-1cb6-40fb-843e-aee612862362"/>
<column name="TITLE" value="Other_sympathy available"/>
<column name="CONTAINER" value="SalesprojectEstimation"/>
<column name="SORTING" valueNumeric="10"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="9d6739d7-9f76-4f8e-a641-a141d087fc1c"/>
<column name="KEYID" value="5de71df0-5086-49b8-bd72-a2c0a698e134"/>
<column name="TITLE" value="Other_advocate available"/>
<column name="CONTAINER" value="SalesprojectEstimation"/>
<column name="SORTING" valueNumeric="11"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<rollback>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="0a1dd1ed-800b-4b1d-a253-7936dac95a9d" />
</whereParams>
</delete>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="1d670df0-ab0e-45b6-85b8-d1ae4439da70" />
</whereParams>
</delete>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="0c7250da-a8ec-4509-98f4-660ad671837a" />
</whereParams>
</delete>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="a5fb241b-0818-41b7-ae4f-939c2aa0b112" />
</whereParams>
</delete>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="6c932def-573d-409c-94b7-3e8640f2bdc6" />
</whereParams>
</delete>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="9f00cf54-d28b-4d77-a828-791c6d336d41" />
</whereParams>
</delete>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="f7d55e39-1600-4a74-bfac-c6298e527e2d" />
</whereParams>
</delete>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="819d7bf1-1248-435d-9131-8faaae0a4a37" />
</whereParams>
</delete>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="74828345-edb0-47b4-aa80-1bc956021f43" />
</whereParams>
</delete>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="57defed0-4545-40c9-bbd0-3014511332fc" />
</whereParams>
</delete>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="9d6739d7-9f76-4f8e-a641-a141d087fc1c" />
</whereParams>
</delete>
</rollback>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
others/db_changes/data_alias/basic/2019.2/changelog.xml
+ 0
− 2
View file @ 6f94f51b
......@@ -55,7 +55,6 @@
<include relativeToChangelogFile="true" file="ActivityCategory.xml"/>
<include relativeToChangelogFile="true" file="CommunicationMedium.xml"/>
<include relativeToChangelogFile="true" file="AddressType.xml"/>
<include relativeToChangelogFile="true" file="SalesProjectEstimation.xml"/>
<include relativeToChangelogFile="true" file="SalesProjectStrength.xml"/>
<include relativeToChangelogFile="true" file="SalesProjectPhase.xml"/>
<include relativeToChangelogFile="true" file="SalesProjectState.xml"/>
......@@ -70,6 +69,5 @@
<include relativeToChangelogFile="true" file="AditoBasic/init_AddressType.xml"/>
<include relativeToChangelogFile="true" file="AditoBasic/init_SalesProjectState.xml"/>
<include relativeToChangelogFile="true" file="AditoBasic/init_SalesProjectPhase.xml"/>
<include relativeToChangelogFile="true" file="AditoBasic/init_SalesprojectEstimation.xml"/>
<include relativeToChangelogFile="true" file="AditoBasic/init_TaskPriority.xml"/>
</databaseChangeLog>
others/db_changes/data_alias/basic/2019.2/drop_estimation_salesproject.xml deleted 100644 → 0
+ 0
− 14
View file @ c24adc6d
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<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="j.hoermann" id="0601eb26-fc5e-4b57-ad18-2b6a064f383f">
<dropColumn tableName="SALESPROJECT" columnName="ESTIMATION"/>
<dropColumn tableName="SALESPROJECT" columnName="ESTIMATIONVALUE"/>
<rollback>
<addColumn tableName="SALESPROJECT">
<column name="ESTIMATION" type="NVARCHAR(50)"/>
<column name="ESTIMATIONVALUE" type="INTEGER"/>
</addColumn>
</rollback>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
process/KeywordRegistry_basic/process.js
+ 0
− 1
View file @ 6f94f51b
......@@ -52,7 +52,6 @@ $KeywordRegistry.communicationMedium = function(){return "CommunicationMedium"};
$KeywordRegistry.salesprojectPricePolitics = function(){return "SalesprojectPricePolitics"};
$KeywordRegistry.salesprojectWeakness = function(){return "SalesprojectWeakness"};
$KeywordRegistry.salesprojectStrenght = function(){return "SalesprojectStrenght"};
$KeywordRegistry.salesprojectEstimation = function(){return "SalesprojectEstimation"};
$KeywordRegistry.salesprojectState = function(){return "SalesprojectState"};
$KeywordRegistry.salesprojectPhase = function(){return "SalesprojectPhase"};
$KeywordRegistry.taskPriority = function(){return "TaskPriority"};
\ No newline at end of file
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