From 0fca3595e830a543145a73743422513100791669 Mon Sep 17 00:00:00 2001
From: Nico Bugl <n.bugl@adito.de>
Date: Wed, 5 Jun 2019 13:50:01 +0200
Subject: [PATCH] letzten Bearbeitungen
---
.../basic/2019.2/update_Memberrole_InternExtern.xml | 6 ------
.../basic/2019.2/update_Salesproject_Member.xml | 2 +-
.../ab_keyword_entry/init_SalesprojectMemberRole.xml | 9 ---------
entity/Competition_entity/Competition_entity.aod | 2 +-
entity/Member_entity/Member_entity.aod | 10 ++++++++++
.../entityfields/decider/dropDownProcess.js | 7 +++++++
neonView/MemberEdit_view/MemberEdit_view.aod | 4 ++++
neonView/MemberFilter_view/MemberFilter_view.aod | 4 ++++
8 files changed, 27 insertions(+), 17 deletions(-)
create mode 100644 entity/Member_entity/entityfields/decider/dropDownProcess.js
diff --git a/.liquibase/Data_alias/basic/2019.2/update_Memberrole_InternExtern.xml b/.liquibase/Data_alias/basic/2019.2/update_Memberrole_InternExtern.xml
index 84e55f1be3b..40aafe37e60 100644
--- a/.liquibase/Data_alias/basic/2019.2/update_Memberrole_InternExtern.xml
+++ b/.liquibase/Data_alias/basic/2019.2/update_Memberrole_InternExtern.xml
@@ -20,12 +20,6 @@
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="0bdeb691-f90a-4d7e-a99a-08c60816232c"/>
<column name="BOOL_VALUE" valueNumeric="1"/>
</insert>
- <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
- <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="ffc45174-b0c0-413e-9a67-b7dc9cd9aa5a"/>
- <column name="AB_KEYWORD_ENTRY_ID" value="3d603fe3-1b06-43fc-9e20-2efd6e9e4afd"/>
- <column name="AB_KEYWORD_ATTRIBUTE_ID" value="0bdeb691-f90a-4d7e-a99a-08c60816232c"/>
- <column name="BOOL_VALUE" valueNumeric="1"/>
- </insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="965d3371-1632-4f2b-9fb6-d8503558fb88"/>
<column name="AB_KEYWORD_ENTRY_ID" value="b72294cd-3a46-4f71-ab93-72824f63f7f4"/>
diff --git a/.liquibase/Data_alias/basic/2019.2/update_Salesproject_Member.xml b/.liquibase/Data_alias/basic/2019.2/update_Salesproject_Member.xml
index 7b9bcb41e92..3e6a9d523a1 100644
--- a/.liquibase/Data_alias/basic/2019.2/update_Salesproject_Member.xml
+++ b/.liquibase/Data_alias/basic/2019.2/update_Salesproject_Member.xml
@@ -4,7 +4,7 @@
<addColumn tableName="SALESPROJECT_MEMBER">
<column name="OBJECT_TYPE" type="NVARCHAR(63)"/>
- <column name="DECIDER" type="NVARCHAR(36)"/>
+ <column name="DECIDER" type="BOOLEAN"/>
</addColumn>
<renameColumn newColumnName="OBJECT_ROWID" oldColumnName="SALESPROJECT_ID" tableName="SALESPROJECT_MEMBER"/>
<renameColumn newColumnName="MEMBERID" oldColumnName="SALESPROJECT_MEMBERID" tableName="SALESPROJECT_MEMBER"/>
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectMemberRole.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectMemberRole.xml
index 3f1e9aed90a..3ed1316c978 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectMemberRole.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectMemberRole.xml
@@ -28,15 +28,6 @@
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
- <insert tableName="AB_KEYWORD_ENTRY">
- <column name="AB_KEYWORD_ENTRYID" value="3d603fe3-1b06-43fc-9e20-2efd6e9e4afd"/>
- <column name="KEYID" value="70cbad1b-eac6-4369-ba50-4946e0fbcb3a"/>
- <column name="TITLE" value="Decision maker"/>
- <column name="CONTAINER" value="MemberRole"/>
- <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="039fd6ae-b4ad-431e-86bf-59ed2f4df0a9"/>
<column name="KEYID" value="a8460c8e-24bd-4410-9704-e4865fdd57bf"/>
diff --git a/entity/Competition_entity/Competition_entity.aod b/entity/Competition_entity/Competition_entity.aod
index d086d45b103..b7fac12ff2d 100644
--- a/entity/Competition_entity/Competition_entity.aod
+++ b/entity/Competition_entity/Competition_entity.aod
@@ -3,7 +3,7 @@
<name>Competition_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Competition</title>
- <titlePlural>Competitions</titlePlural>
+ <titlePlural>Competition</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/Member_entity/Member_entity.aod b/entity/Member_entity/Member_entity.aod
index e6f4ea91b7c..8d043c5a8a8 100644
--- a/entity/Member_entity/Member_entity.aod
+++ b/entity/Member_entity/Member_entity.aod
@@ -218,6 +218,12 @@ TODO: intuitive möglichkeit, auf dend Stand aus Relation zurückzusetzen... akt
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/Member_entity/entityfields/icon/valueProcess.js</valueProcess>
</entityField>
+ <entityField>
+ <name>DECIDER</name>
+ <title>Decision maker</title>
+ <contentType>BOOLEAN</contentType>
+ <dropDownProcess>%aditoprj%/entity/Member_entity/entityfields/decider/dropDownProcess.js</dropDownProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -340,6 +346,10 @@ TODO: intuitive möglichkeit, auf dend Stand aus Relation zurückzusetzen... akt
<name>OBJECT_ROWID.displayValue</name>
<expression>%aditoprj%/entity/Member_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DECIDER.value</name>
+ <recordfield>MEMBER.DECIDER</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Member_entity/entityfields/decider/dropDownProcess.js b/entity/Member_entity/entityfields/decider/dropDownProcess.js
new file mode 100644
index 00000000000..9b90ec71268
--- /dev/null
+++ b/entity/Member_entity/entityfields/decider/dropDownProcess.js
@@ -0,0 +1,7 @@
+import("system.translate");
+import("system.result");
+
+result.object([
+ [true, translate.text("Yes")]
+ ,[false, translate.text("No")]
+]);
diff --git a/neonView/MemberEdit_view/MemberEdit_view.aod b/neonView/MemberEdit_view/MemberEdit_view.aod
index 74a7cde60b8..7db2988ef34 100644
--- a/neonView/MemberEdit_view/MemberEdit_view.aod
+++ b/neonView/MemberEdit_view/MemberEdit_view.aod
@@ -22,6 +22,10 @@
<name>84696d3f-fe39-45f2-a48a-90cd916b125f</name>
<entityField>ROLE</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>188da6f5-4e65-4918-ba4c-379887d51449</name>
+ <entityField>DECIDER</entityField>
+ </entityFieldLink>
</fields>
</genericViewTemplate>
</children>
diff --git a/neonView/MemberFilter_view/MemberFilter_view.aod b/neonView/MemberFilter_view/MemberFilter_view.aod
index 6bb508e6cf0..6a719214fa3 100644
--- a/neonView/MemberFilter_view/MemberFilter_view.aod
+++ b/neonView/MemberFilter_view/MemberFilter_view.aod
@@ -41,6 +41,10 @@
<name>c23f4e8b-87a1-4535-b2d1-f6c97d6bfe0b</name>
<entityField>POSITION</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>ade2cdae-ad07-4797-9440-00eddda68ee5</name>
+ <entityField>DECIDER</entityField>
+ </neonTableColumn>
</columns>
</tableViewTemplate>
</children>
--
GitLab