Merge branch '#1065349-SalesprojectPhaseDefinition' into '2021.0.0'

#1065349 salesproject phase definition See merge request xrm/basic!591

Merge branch '#1065349-SalesprojectPhaseDefinition' into '2021.0.0'
349f0ea1 · Johannes Goderbauer · 70383709 · 222cb67c · 349f0ea1 · 349f0ea1
Commit 349f0ea1 authored 4 years ago by Johannes Goderbauer
--- a/entity/ChecklistEntry_entity/entityfields/date_new/valueProcess.js
+++ b/entity/ChecklistEntry_entity/entityfields/date_new/valueProcess.js
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+{
+    result.string(vars.get("$sys.date"));
+}
\ No newline at end of file
--- a/entity/ChecklistEntry_entity/entityfields/title/displayValueProcess.js
+++ b/entity/ChecklistEntry_entity/entityfields/title/displayValueProcess.js
+import("system.result");
+import("system.vars");
+import("system.translate");
+import("KeywordRegistry_basic");
+
+var title = vars.get("$field.TITLE");
+
+if (vars.get("$field.TYPE") == $KeywordRegistry.checklistEntryType$manual())
+{
+    result.string(translate.text(title));
+}
\ No newline at end of file
--- a/entity/ChecklistEntry_entity/entityfields/title/dropDownProcess.js
+++ b/entity/ChecklistEntry_entity/entityfields/title/dropDownProcess.js
+import("system.result");
+import("system.vars");
+import("KeywordRegistry_basic");
+import("ChecklistEntryRegistry_basic");
+
+
+if (vars.get("$field.TYPE") == $KeywordRegistry.checklistEntryType$auto())
+{
+    result.object($ChecklistEntryRegistry.getEntryList());
+}
\ No newline at end of file
--- a/entity/ChecklistEntry_entity/entityfields/type/dropDownProcess.js
+++ b/entity/ChecklistEntry_entity/entityfields/type/dropDownProcess.js
+import("system.result");
+import("system.vars");
+import("system.translate");
+
+result.object({"MANUAL":translate.text("Manually"), "AUTO":translate.text("Automatically")});
\ No newline at end of file
--- a/entity/ChecklistEntry_entity/entityfields/user_edit/valueProcess.js
+++ b/entity/ChecklistEntry_entity/entityfields/user_edit/valueProcess.js
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+{
+    result.string(vars.get("$sys.user"));
+}
\ No newline at end of file
--- a/entity/ChecklistEntry_entity/entityfields/user_new/valueProcess.js
+++ b/entity/ChecklistEntry_entity/entityfields/user_new/valueProcess.js
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+{
+    result.string(vars.get("$sys.user"));
+}
\ No newline at end of file
--- a/entity/ChecklistEntry_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/ChecklistEntry_entity/recordcontainers/db/conditionProcess.js
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+
+var checklistId = vars.get("$param.ChecklistUid_param");
+var cond = newWhere();
+
+if (checklistId) 
+{
+    cond.and("CHECKLISTENTRY.CHECKLIST_ID", checklistId);
+}
+else
+{
+    cond.and("1 = 2");
+}
+
+result.string(cond.toString());
\ No newline at end of file
--- a/entity/Checklist_entity/Checklist_entity.aod
+++ b/entity/Checklist_entity/Checklist_entity.aod
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+  <name>Checklist_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>NEON:MQC</icon>
+  <siblings />
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
+    <entityField>
+      <name>CHECKLISTID</name>
+    </entityField>
+    <entityField>
+      <name>USER_EDIT</name>
+      <valueProcess>%aditoprj%/entity/Checklist_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>USER_NEW</name>
+      <valueProcess>%aditoprj%/entity/Checklist_entity/entityfields/user_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_NEW</name>
+      <valueProcess>%aditoprj%/entity/Checklist_entity/entityfields/date_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_EDIT</name>
+      <valueProcess>%aditoprj%/entity/Checklist_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityProvider>
+      <name>Checklists</name>
+      <documentation>%aditoprj%/entity/Checklist_entity/entityfields/checklists/documentation.adoc</documentation>
+    </entityProvider>
+    <entityConsumer>
+      <name>ChecklistEntries</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>ChecklistEntry_entity</entityName>
+        <fieldName>ChecklistEntries</fieldName>
+      </dependency>
+    </entityConsumer>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>CHECKLISTID.value</name>
+          <recordfield>CHECKLIST.CHECKLISTID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_EDIT.value</name>
+          <recordfield>CHECKLIST.DATE_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_NEW.value</name>
+          <recordfield>CHECKLIST.DATE_NEW</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_EDIT.value</name>
+          <recordfield>CHECKLIST.USER_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_NEW.value</name>
+          <recordfield>CHECKLIST.USER_NEW</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+      <linkInformation>
+        <linkInformation>
+          <name>6151d9b7-6253-459b-953d-027710b120d7</name>
+          <tableName>CHECKLIST</tableName>
+          <primaryKey>CHECKLISTID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
--- a/entity/Checklist_entity/entityfields/checklists/documentation.adoc
+++ b/entity/Checklist_entity/entityfields/checklists/documentation.adoc
--- a/entity/Checklist_entity/entityfields/date_edit/valueProcess.js
+++ b/entity/Checklist_entity/entityfields/date_edit/valueProcess.js
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+{
+    result.string(vars.get("$sys.date"));
+}
\ No newline at end of file
--- a/entity/Checklist_entity/entityfields/date_new/valueProcess.js
+++ b/entity/Checklist_entity/entityfields/date_new/valueProcess.js
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+{
+    result.string(vars.get("$sys.date"));
+}
\ No newline at end of file
--- a/entity/Checklist_entity/entityfields/user_edit/valueProcess.js
+++ b/entity/Checklist_entity/entityfields/user_edit/valueProcess.js
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+{
+    result.string(vars.get("$sys.user"));
+}
\ No newline at end of file
--- a/entity/Checklist_entity/entityfields/user_new/valueProcess.js
+++ b/entity/Checklist_entity/entityfields/user_new/valueProcess.js
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+{
+    result.string(vars.get("$sys.user"));
+}
\ No newline at end of file
--- a/entity/Competition_entity/Competition_entity.aod
+++ b/entity/Competition_entity/Competition_entity.aod
@@ -174,7 +174,7 @@
      <name>KeywordPhases</name>
      <dependency>
        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
+        <entityName>ChecklistEntryValue_entity</entityName>
        <fieldName>SpecificContainerKeywords</fieldName>
      </dependency>
      <children>

--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -320,12 +320,6 @@
          <fieldName>KeywordStates</fieldName>
          <isConsumer v="false" />
        </entityDependency>
-        <entityDependency>
-          <name>3ca6d3c7-83d2-4761-bab4-50d2baecdbd6</name>
-          <entityName>Competition_entity</entityName>
-          <fieldName>KeywordPhases</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
        <entityDependency>
          <name>1053a90d-574a-4ca2-b41d-42b513db0fd2</name>
          <entityName>Task_entity</entityName>

--- a/entity/Member_entity/Member_entity.aod
+++ b/entity/Member_entity/Member_entity.aod
@@ -436,6 +436,7 @@
      <name>jdito</name>
      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
      <isFilterable v="true" />
+      <isSortable v="true" />
      <contentProcess>%aditoprj%/entity/Member_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
      <onInsert>%aditoprj%/entity/Member_entity/recordcontainers/jdito/onInsert.js</onInsert>
      <onUpdate>%aditoprj%/entity/Member_entity/recordcontainers/jdito/onUpdate.js</onUpdate>

--- a/entity/SalesprojectPhaseDefinition_entity/SalesprojectPhaseDefinition_entity.aod
+++ b/entity/SalesprojectPhaseDefinition_entity/SalesprojectPhaseDefinition_entity.aod
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+  <name>SalesprojectPhaseDefinition_entity</name>
+  <title>Salesproject phases</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>VAADIN:LIST_UL</icon>
+  <siblings />
+  <iconIdProcess>%aditoprj%/entity/SalesprojectPhaseDefinition_entity/iconIdProcess.js</iconIdProcess>
+  <imageProcess>%aditoprj%/entity/SalesprojectPhaseDefinition_entity/imageProcess.js</imageProcess>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
+    <entityField>
+      <name>SALESPROJECTPHASETRAITDEFINITIONID</name>
+    </entityField>
+    <entityField>
+      <name>USER_NEW</name>
+      <valueProcess>%aditoprj%/entity/SalesprojectPhaseDefinition_entity/entityfields/user_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>USER_EDIT</name>
+      <valueProcess>%aditoprj%/entity/SalesprojectPhaseDefinition_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_NEW</name>
+      <valueProcess>%aditoprj%/entity/SalesprojectPhaseDefinition_entity/entityfields/date_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_EDIT</name>
+      <valueProcess>%aditoprj%/entity/SalesprojectPhaseDefinition_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>PHASE</name>
+      <title>Phase</title>
+      <mandatory v="true" />
+      <dropDownProcess>%aditoprj%/entity/SalesprojectPhaseDefinition_entity/entityfields/phase/dropDownProcess.js</dropDownProcess>
+      <displayValueProcess>%aditoprj%/entity/SalesprojectPhaseDefinition_entity/entityfields/phase/displayValueProcess.js</displayValueProcess>
+      <onValidation>%aditoprj%/entity/SalesprojectPhaseDefinition_entity/entityfields/phase/onValidation.js</onValidation>
+    </entityField>
+    <entityParameter>
+      <name>SalesprojectUid_param</name>
+      <expose v="false" />
+    </entityParameter>
+    <entityParameter>
+      <name>SalesprojectPhaseId_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityProvider>
+      <name>SalesprojectPhaseDefinitions</name>
+      <lookupIdfield>SALESPROJECTPHASETRAITDEFINITIONID</lookupIdfield>
+      <dependencies>
+        <entityDependency>
+          <name>1d8760d0-186d-411d-a84e-dc82556ad722</name>
+          <entityName>SalesprojectPhaseTrait_entity</entityName>
+          <fieldName>SalesprojectPhaseDefinitions</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
+    <entityFieldGroup>
+      <name>SalesprojectPhaseFullname</name>
+      <valueProcess>%aditoprj%/entity/SalesprojectPhaseDefinition_entity/entityfields/salesprojectphasefullname/valueProcess.js</valueProcess>
+      <fields>
+        <element>PHASE</element>
+      </fields>
+    </entityFieldGroup>
+    <entityConsumer>
+      <name>ChecklistEntries</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>ChecklistEntry_entity</entityName>
+        <fieldName>ChecklistEntries</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ChecklistUid_param</name>
+          <valueProcess>%aditoprj%/entity/SalesprojectPhaseDefinition_entity/entityfields/checklistentries/children/checklistuid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>CHECKLIST_ID</name>
+      <valueProcess>%aditoprj%/entity/SalesprojectPhaseDefinition_entity/entityfields/checklist_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>traitCount</name>
+      <title>Traits</title>
+      <valueProcess>%aditoprj%/entity/SalesprojectPhaseDefinition_entity/entityfields/traitcount/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/SalesprojectPhaseDefinition_entity/entityfields/traitcount/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>DESCRIPTION</name>
+      <title>Description</title>
+      <contentType>LONG_TEXT</contentType>
+    </entityField>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <onDBInsert>%aditoprj%/entity/SalesprojectPhaseDefinition_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
+      <alias>Data_alias</alias>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>CHECKLIST_ID.value</name>
+          <recordfield>SALESPROJECTPHASEDEFINITION.CHECKLIST_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_EDIT.value</name>
+          <recordfield>SALESPROJECTPHASEDEFINITION.DATE_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_NEW.value</name>
+          <recordfield>SALESPROJECTPHASEDEFINITION.DATE_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DESCRIPTION.value</name>
+          <recordfield>SALESPROJECTPHASEDEFINITION.DESCRIPTION</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PHASE.value</name>
+          <recordfield>SALESPROJECTPHASEDEFINITION.PHASE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PHASE.displayValue</name>
+          <recordfield>SALESPROJECTPHASEDEFINITION.PHASE</recordfield>
+          <expression>%aditoprj%/entity/SalesprojectPhaseDefinition_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SALESPROJECTPHASETRAITDEFINITIONID.value</name>
+          <recordfield>SALESPROJECTPHASEDEFINITION.SALESPROJECTPHASEDEFINITIONID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_EDIT.value</name>
+          <recordfield>SALESPROJECTPHASEDEFINITION.USER_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_NEW.value</name>
+          <recordfield>SALESPROJECTPHASEDEFINITION.USER_NEW</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+      <linkInformation>
+        <linkInformation>
+          <name>6b48c807-5948-41ff-a5b5-b1556db01c3e</name>
+          <tableName>SALESPROJECTPHASEDEFINITION</tableName>
+          <primaryKey>SALESPROJECTPHASEDEFINITIONID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
--- a/entity/SalesprojectPhaseDefinition_entity/entityfields/checklist_id/valueProcess.js
+++ b/entity/SalesprojectPhaseDefinition_entity/entityfields/checklist_id/valueProcess.js
+import("system.vars");
+import("system.result");
+import("system.util");
+
+
+if (!vars.get("$field.CHECKLIST_ID")) 
+{
+    result.string(util.getNewUUID());
+}
\ No newline at end of file
--- a/entity/SalesprojectPhaseDefinition_entity/entityfields/checklistentries/children/checklistuid_param/valueProcess.js
+++ b/entity/SalesprojectPhaseDefinition_entity/entityfields/checklistentries/children/checklistuid_param/valueProcess.js
+import("system.result");
+import("system.vars");
+
+
+result.string(vars.get("$field.CHECKLIST_ID"));
\ No newline at end of file
--- a/entity/SalesprojectPhaseDefinition_entity/entityfields/date_edit/valueProcess.js
+++ b/entity/SalesprojectPhaseDefinition_entity/entityfields/date_edit/valueProcess.js
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+
+var currentDate = null;
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+{
+    currentUser = vars.get("$sys.date");
+}
+
+result.string(currentDate);
\ No newline at end of file