diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod index 4e792a2decaf645afe88c4b7bd2b120eea618036..9c448b6bc0b7c2444e49f01a533cf187188695ab 100644 --- a/entity/Task_entity/Task_entity.aod +++ b/entity/Task_entity/Task_entity.aod @@ -77,7 +77,9 @@ <name>TYPE</name> <title>type</title> <consumer>KeywordTypes</consumer> - <groupable v="true" /> + <searchable v="false" /> + <groupable v="false" /> + <valueProcess>%aditoprj%/entity/Task_entity/entityfields/type/valueProcess.js</valueProcess> </entityField> <entityField> <name>DESCRIPTION</name> diff --git a/entity/Task_entity/entityfields/type/valueProcess.js b/entity/Task_entity/entityfields/type/valueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..68427766d13467b6bb55261aa6249df15cf8eacb --- /dev/null +++ b/entity/Task_entity/entityfields/type/valueProcess.js @@ -0,0 +1,4 @@ +import("system.result"); + +// Sets the type to "Task" as default value. +result.string("4dee8727-8299-422e-ae41-6cdf9de2dfd7"); \ No newline at end of file diff --git a/neonView/TaskEdit_view/TaskEdit_view.aod b/neonView/TaskEdit_view/TaskEdit_view.aod index 17c595d7e5a591a458451e2040eb3ba7ff1c83d6..a935024a1a70e8681a025b07d7fd8bfe0b4348d8 100644 --- a/neonView/TaskEdit_view/TaskEdit_view.aod +++ b/neonView/TaskEdit_view/TaskEdit_view.aod @@ -37,10 +37,6 @@ <name>0f600024-eb83-445c-8eb9-62bcf9e95313</name> <entityField>PRIORITY</entityField> </entityFieldLink> - <entityFieldLink> - <name>8173056f-fac6-4ee0-a8ff-c27c8184e6e9</name> - <entityField>TYPE</entityField> - </entityFieldLink> <entityFieldLink> <name>71d2b122-1687-454a-ae60-7e68aa83106c</name> <entityField>PROTECTIONLEVEL</entityField> diff --git a/neonView/TaskMain_view/TaskMain_view.aod b/neonView/TaskMain_view/TaskMain_view.aod index cc31fbb6b14d6b8fc84c30cbc7e88cf192695088..149f56dedc1aaca285dbe649edac6095b515cd92 100644 --- a/neonView/TaskMain_view/TaskMain_view.aod +++ b/neonView/TaskMain_view/TaskMain_view.aod @@ -24,10 +24,6 @@ <name>e95918f5-d21e-4c99-8d05-d70811aa3d89</name> <entityField>PROTECTIONLEVEL</entityField> </entityFieldLink> - <entityFieldLink> - <name>e73dda40-22cd-4d2d-abcf-c7fc59ea2e67</name> - <entityField>TYPE</entityField> - </entityFieldLink> <entityFieldLink> <name>fea59f13-750b-427d-bf33-cc1bead95446</name> <entityField>DESCRIPTION</entityField> diff --git a/neonView/TaskPreview_view/TaskPreview_view.aod b/neonView/TaskPreview_view/TaskPreview_view.aod index 5f1e9c767f3c62cd9a462c6ba3d802b129c1dff9..485449c2c992d353908afb889d6d949776b23105 100644 --- a/neonView/TaskPreview_view/TaskPreview_view.aod +++ b/neonView/TaskPreview_view/TaskPreview_view.aod @@ -40,10 +40,6 @@ <name>d9e4daef-84df-415c-9be7-3238c2760c07</name> <entityField>PROTECTIONLEVEL</entityField> </entityFieldLink> - <entityFieldLink> - <name>5bcbaa89-0826-4ef8-872d-bd68dbd8ef77</name> - <entityField>TYPE</entityField> - </entityFieldLink> <entityFieldLink> <name>05de9afc-429e-46a8-8e3b-2ff689ed090e</name> <entityField>REQUESTOR_CONTACT_ID</entityField> diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry.xml b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry.xml index bf57d6e5328a16d694d400033173a33f773f3c99..0334b4852551b923c2ed7ca478c614cdd54b7645 100644 --- a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry.xml +++ b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry.xml @@ -25,4 +25,5 @@ <include relativeToChangelogFile="true" file="ab_keyword_entry/init_TaskType.xml"/> <include relativeToChangelogFile="true" file="ab_keyword_entry/init_AttributeType.xml"/> <include relativeToChangelogFile="true" file="ab_keyword_entry/init_SalesprojectProbability.xml"/> + <include relativeToChangelogFile="true" file="ab_keyword_entry/update_TaskType_Task.xml" /> </databaseChangeLog> diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/update_TaskType_Task.xml b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/update_TaskType_Task.xml new file mode 100644 index 0000000000000000000000000000000000000000..742eab471484632a2748765e240f3d96129ff920 --- /dev/null +++ b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/update_TaskType_Task.xml @@ -0,0 +1,84 @@ +<?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.loreth" id="d1440b93-e01c-406b-9f0d-c55cac877fcd"> + <insert tableName="AB_KEYWORD_ENTRY"> + <column name="AB_KEYWORD_ENTRYID" value="9e30365b-a9a6-4b57-ae6b-140c9e5a4eb4"/> + <column name="KEYID" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/> + <column name="TITLE" value="Task"/> + <column name="CONTAINER" value="TaskType"/> + <column name="SORTING" valueNumeric="0"/> + <column name="ISACTIVE" valueNumeric="1"/> + <column name="ISESSENTIAL" valueNumeric="0"/> + </insert> + <delete tableName="AB_KEYWORD_ENTRY"> + <where>AB_KEYWORD_ENTRYID = ?</where> + <whereParams> + <param value="7bd67c84-cb9d-4bb8-9189-4dd92c4b38a0" /> + </whereParams> + </delete> + <delete tableName="AB_KEYWORD_ENTRY"> + <where>AB_KEYWORD_ENTRYID = ?</where> + <whereParams> + <param value="971b9424-9dda-4a4b-b6db-66c3ae3258ad" /> + </whereParams> + </delete> + <delete tableName="AB_KEYWORD_ENTRY"> + <where>AB_KEYWORD_ENTRYID = ?</where> + <whereParams> + <param value="54231fc1-050e-4f00-91e1-4968387a6370" /> + </whereParams> + </delete> + <delete tableName="AB_KEYWORD_ENTRY"> + <where>AB_KEYWORD_ENTRYID = ?</where> + <whereParams> + <param value="ac87d05f-2cf5-4c77-8342-c11e0cce7c8b" /> + </whereParams> + </delete> + + + <rollback> + <delete tableName="AB_KEYWORD_ENTRY"> + <where>AB_KEYWORD_ENTRYID = ?</where> + <whereParams> + <param value="9e30365b-a9a6-4b57-ae6b-140c9e5a4eb4"/> + </whereParams> + </delete> + <insert tableName="AB_KEYWORD_ENTRY"> + <column name="AB_KEYWORD_ENTRYID" value="7bd67c84-cb9d-4bb8-9189-4dd92c4b38a0"/> + <column name="KEYID" value="2594110a-a5a2-4516-a581-7540167e3976"/> + <column name="TITLE" value="Visit"/> + <column name="CONTAINER" value="TaskType"/> + <column name="SORTING" valueNumeric="0"/> + <column name="ISACTIVE" valueNumeric="1"/> + <column name="ISESSENTIAL" valueNumeric="0"/> + </insert> + <insert tableName="AB_KEYWORD_ENTRY"> + <column name="AB_KEYWORD_ENTRYID" value="971b9424-9dda-4a4b-b6db-66c3ae3258ad"/> + <column name="KEYID" value="d1765fbd-3388-4ac1-a67e-22533f14ef94"/> + <column name="TITLE" value="E-Mail"/> + <column name="CONTAINER" value="TaskType"/> + <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="54231fc1-050e-4f00-91e1-4968387a6370"/> + <column name="KEYID" value="c402d3ad-9c46-4e79-b7fa-f70b771cb9d0"/> + <column name="TITLE" value="Phone"/> + <column name="CONTAINER" value="TaskType"/> + <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="ac87d05f-2cf5-4c77-8342-c11e0cce7c8b"/> + <column name="KEYID" value="76188d38-a969-420e-bb99-d713ad7ce6fb"/> + <column name="TITLE" value="Online-Meeting"/> + <column name="CONTAINER" value="TaskType"/> + <column name="SORTING" valueNumeric="3"/> + <column name="ISACTIVE" valueNumeric="1"/> + <column name="ISESSENTIAL" valueNumeric="0"/> + </insert> + </rollback> + </changeSet> +</databaseChangeLog> \ No newline at end of file