Skip to content
Snippets Groups Projects
Commit 09116733 authored by Johannes Hörmann's avatar Johannes Hörmann
Browse files

Merge branch 'SalesProjectGantt' into 'master' 

Sales project gantt

See merge request xrm/basic!51
parents 10573b2b 2e7b8096
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 105 additions and 6 deletions
.liquibase/Data_alias/basic/2019.1.4/Salesproject_Phase_LongNames.xml 0 → 100644
+ 67
− 0
View file @ 09116733
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="m.mansour" id="13c8eaf7-39d2-41c0-aff4-9cca30d32422">
<insert tableName="AB_KEYWORD_ATTRIBUTE">
<column name="AB_KEYWORD_ATTRIBUTEID" value="f1413a2f-6631-4255-9dc9-a28e6eb30497"/>
<column name="NAME" value="longName"/>
<column name="CONTAINER" value="SalesprojectPhase"/>
<column name="TYPE" value="CHAR_VALUE"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="4b4045ac-913c-4618-b6be-9458c2094d21"/>
<column name="AB_KEYWORD_ENTRY_ID" value="b42caac9-8f8f-46e5-9f1c-d121cdf3ad8f"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="f1413a2f-6631-4255-9dc9-a28e6eb30497"/>
<column name="CHAR_VALUE" value="Not Qualified Contact"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="b6a9f74b-bfc0-41b5-ac97-48f059cd1051"/>
<column name="AB_KEYWORD_ENTRY_ID" value="8a2d19c9-bc32-437e-9261-78ed30110e92"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="f1413a2f-6631-4255-9dc9-a28e6eb30497"/>
<column name="CHAR_VALUE" value="Marketing Accepted Lead"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="77370a25-7b08-4a75-b09b-ff806c184a12"/>
<column name="AB_KEYWORD_ENTRY_ID" value="46f55a58-dbe4-40ae-9306-481df9095088"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="f1413a2f-6631-4255-9dc9-a28e6eb30497"/>
<column name="CHAR_VALUE" value="Marketing Qualified Lead"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="16fd4267-46d0-4d66-8241-ad620ba359e0"/>
<column name="AB_KEYWORD_ENTRY_ID" value="afa8cf58-07e8-4ee9-b24e-96cb6fa76aec"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="f1413a2f-6631-4255-9dc9-a28e6eb30497"/>
<column name="CHAR_VALUE" value="Sales Accepted Lead"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="846c6387-56b0-45b5-8f4b-71f1177d7c25"/>
<column name="AB_KEYWORD_ENTRY_ID" value="c9483fb9-c295-43d2-94e0-8c949cf6dc47"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="f1413a2f-6631-4255-9dc9-a28e6eb30497"/>
<column name="CHAR_VALUE" value="Sales Qualified Offer"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="4284c1b3-c217-43b5-a06f-462626aadfdc"/>
<column name="AB_KEYWORD_ENTRY_ID" value="028af5dd-1071-4108-8685-ed7124376706"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="f1413a2f-6631-4255-9dc9-a28e6eb30497"/>
<column name="CHAR_VALUE" value="Marketing Qualified Contact"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="945097dd-590f-4c53-bb33-5d425516495e"/>
<column name="AB_KEYWORD_ENTRY_ID" value="0e8eab64-4c79-4eed-9746-0ac6fc397620"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="f1413a2f-6631-4255-9dc9-a28e6eb30497"/>
<column name="CHAR_VALUE" value="Offer"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="440bd4c0-9d2a-4adc-a4ee-15aa8109a265"/>
<column name="AB_KEYWORD_ENTRY_ID" value="405e2b7b-20c2-4824-a8b5-c7a533784ef3"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="f1413a2f-6631-4255-9dc9-a28e6eb30497"/>
<column name="CHAR_VALUE" value="Negotiation"/>
</insert>
</changeSet>
</databaseChangeLog>
.liquibase/Data_alias/basic/2019.1.4/changelog.xml
+ 3
− 0
View file @ 09116733
......@@ -168,4 +168,7 @@
<include relativeToChangelogFile="true" file="Salesproject_Phase_icons.xml"/>
<include relativeToChangelogFile="true" file="Salesprojectmilestone_add_parent.xml"/>
<include relativeToChangelogFile="true" file="Salesproject_Phase_LongNames.xml"/>
</databaseChangeLog>
.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_MILESTONE.xml
+ 22
− 5
View file @ 09116733
......@@ -10,7 +10,7 @@
<column name="VALUE" value="SALPROJPHASENQC"/>
</insert>
<insert tableName="SALESPROJECT_MILESTONE">
<column name="DATE_START" valueDate="2019-05-16T01:34:58"/>
<column name="DATE_START" valueDate="2019-06-15T01:34:58"/>
<column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
<column name="SALESPROJECT_MILESTONEID" value="ae7fe604-2fea-4aa1-be75-e990e8f31c74"/>
<column name="TYPE" value="SalesprojectState"/>
......@@ -51,7 +51,7 @@
</insert>
<insert tableName="SALESPROJECT_MILESTONE">
<column name="DATE_END" valueDate="2019-05-23T10:44:48"/>
<column name="DATE_START" valueDate="2019-05-17T08:39:38"/>
<column name="DATE_START" valueDate="2019-05-10T08:39:38"/>
<column name="SALESPROJECT_ID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
<column name="SALESPROJECT_MILESTONEID" value="4e764ba9-8f81-4e01-93de-f9769205dd3c"/>
<column name="TYPE" value="SalesprojectPhase"/>
......@@ -66,7 +66,7 @@
</insert>
<insert tableName="SALESPROJECT_MILESTONE">
<column name="DATE_END" valueDate="2019-05-23T10:44:26"/>
<column name="DATE_START" valueDate="2019-05-22T11:51:20"/>
<column name="DATE_START" valueDate="2019-05-14T11:51:20"/>
<column name="SALESPROJECT_ID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
<column name="SALESPROJECT_MILESTONEID" value="d77a1712-bd57-4d4f-bc58-69ce58f31685"/>
<column name="TYPE" value="SalesprojectPhase"/>
......@@ -81,11 +81,22 @@
</insert>
<insert tableName="SALESPROJECT_MILESTONE">
<column name="DATE_START" valueDate="2019-05-22T01:42:51"/>
<column name="DATE_END" valueDate="2019-06-19T08:08:07"/>
<column name="SALESPROJECT_ID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
<column name="SALESPROJECT_MILESTONEID" value="eff31d24-4434-4b92-9de9-eeb8eb43cb72"/>
<column name="TYPE" value="SalesprojectPhase"/>
<column name="VALUE" value="SALPROJPHASESQO"/>
</insert>
<insert tableName="SALESPROJECT_MILESTONE">
<column name="DATE_START" valueDate="2019-06-19T08:08:07"/>
<column name="PARENT_ID" value="eff31d24-4434-4b92-9de9-eeb8eb43cb72"/>
<column name="SALESPROJECT_ID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
<column name="SALESPROJECT_MILESTONEID" value="40512b52-d0f4-4a07-a894-88f72455e700"/>
<column name="TYPE" value="SalesprojectPhase"/>
<column name="VALUE" value="SALPROJPHASEMAL"/>
</insert>
<insert tableName="SALESPROJECT_MILESTONE">
<column name="DATE_START" valueDate="2019-05-22T01:42:51"/>
<column name="SALESPROJECT_ID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
......@@ -93,9 +104,11 @@
<column name="TYPE" value="SalesprojectState"/>
<column name="VALUE" value="SALPROJSTATOPEN"/>
</insert>
<insert tableName="SALESPROJECT_MILESTONE">
<column name="DATE_END" valueDate="2019-05-23T11:30:09"/>
<column name="DATE_START" valueDate="2019-05-23T10:18:10"/>
<column name="DATE_END" valueDate="2019-06-15T11:30:09"/>
<column name="DATE_START" valueDate="2019-06-01T10:18:10"/>
<column name="PARENT_ID" value="b2cb428d-b76b-423a-9b61-04d03213e6d3"/>
<column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
<column name="SALESPROJECT_MILESTONEID" value="47999521-d6ea-4a4d-959c-e72776ba5a25"/>
<column name="TYPE" value="SalesprojectPhase"/>
......@@ -103,6 +116,7 @@
</insert>
<insert tableName="SALESPROJECT_MILESTONE">
<column name="DATE_START" valueDate="2019-05-23T10:44:26"/>
<column name="PARENT_ID" value="d77a1712-bd57-4d4f-bc58-69ce58f31685"/>
<column name="SALESPROJECT_ID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
<column name="SALESPROJECT_MILESTONEID" value="61f7f5d6-01a6-4088-9387-820cb71ea526"/>
<column name="TYPE" value="SalesprojectPhase"/>
......@@ -110,6 +124,7 @@
</insert>
<insert tableName="SALESPROJECT_MILESTONE">
<column name="DATE_START" valueDate="2019-05-23T10:44:48"/>
<column name="PARENT_ID" value="4e764ba9-8f81-4e01-93de-f9769205dd3c"/>
<column name="SALESPROJECT_ID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
<column name="SALESPROJECT_MILESTONEID" value="8a33dafb-4a1b-4ec9-a1cd-37a6c75e3721"/>
<column name="TYPE" value="SalesprojectPhase"/>
......@@ -117,6 +132,8 @@
</insert>
<insert tableName="SALESPROJECT_MILESTONE">
<column name="DATE_START" valueDate="2019-05-23T11:30:10"/>
<column name="DATE_END" valueDate="2019-06-01T11:30:09"/>
<column name="PARENT_ID" value="b2cb428d-b76b-423a-9b61-04d03213e6d3"/>
<column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
<column name="SALESPROJECT_MILESTONEID" value="14da1165-ed6c-4f2a-8766-11d3533804cb"/>
<column name="TYPE" value="SalesprojectPhase"/>
......
entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod
+ 4
− 0
View file @ 09116733
......@@ -147,6 +147,10 @@
<name>dateEndGantt</name>
<valueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/dateendgantt/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>valueLongName</name>
<valueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/valuelongname/valueProcess.js</valueProcess>
</entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......
entity/SalesprojectMilestone_entity/entityfields/valuelongname/valueProcess.js 0 → 100644
+ 8
− 0
View file @ 09116733
import("system.translate");
import("system.vars");
import("system.result");
import("Keyword_lib")
var keywordAttr = new KeywordAttribute(vars.get("$field.TYPE"), "longName", vars.get("$field.VALUE.displayValue"))
result.string(translate.text(keywordAttr.getValue(vars.get("$field.VALUE"))))
\ No newline at end of file
neonView/SalesprojectMilestoneInfo_view/SalesprojectMilestoneInfo_view.aod
+ 1
− 1
View file @ 09116733
......@@ -12,7 +12,7 @@
<name>MilestoneGantt</name>
<beginDateField>DATE_START</beginDateField>
<endDateField>dateEndGantt</endDateField>
<titleField>VALUE</titleField>
<titleField>valueLongName</titleField>
<uidField>SALESPROJECT_MILESTONEID</uidField>
<stepPredecessorIdField>PARENT_ID</stepPredecessorIdField>
<entityField>#ENTITY</entityField>
......
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