letzten Bearbeitungen

.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"/>

.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"/>

.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"/>

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>

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>

entity/Member_entity/entityfields/decider/dropDownProcess.js

+import("system.translate");
+import("system.result");
+
+result.object([
+     [true, translate.text("Yes")]
+    ,[false, translate.text("No")]
+]);

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>

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>