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

salesproject Meilensteine als zwei charts

parent 766895f7
No related branches found
No related tags found
No related merge requests found
Showing
with 121 additions and 19 deletions
<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
<name>SalesprojectMilestone_entity</name>
<title>Milestones</title>
<title></title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<titleProcess>%aditoprj%/entity/SalesprojectMilestone_entity/titleProcess.js</titleProcess>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
......@@ -41,9 +42,9 @@
</entityField>
<entityField>
<name>VALUE</name>
<title>Milestone</title>
<consumer>Keywords</consumer>
<mandatory v="true" />
<titleProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/value/titleProcess.js</titleProcess>
<displayValueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/value/displayValueProcess.js</displayValueProcess>
</entityField>
<entityParameter>
......@@ -57,19 +58,15 @@
<name>SalesprojectMilestones</name>
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
<name>b05e2bdf-5d8b-4ba2-8dba-a8560c255470</name>
<entityName>Salesproject_entity</entityName>
<fieldName>SalesprojectMilestones</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
<name>SalesprojectId_param</name>
<expose v="true" />
</entityParameter>
<entityParameter>
<name>Type_param</name>
<expose v="false" />
</entityParameter>
</children>
</entityProvider>
<entityField>
......@@ -95,6 +92,48 @@
</entityParameter>
</children>
</entityConsumer>
<entityParameter>
<name>Type_param</name>
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityProvider>
<name>StateMilestones</name>
<fieldType>DEPENDENCY_IN</fieldType>
<dependencies>
<entityDependency>
<name>da87708b-e998-4694-81ae-d0068f789a89</name>
<entityName>Salesproject_entity</entityName>
<fieldName>SalesprojectStateMilestones</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
<name>Type_param</name>
<valueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/statemilestones/children/type_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityProvider>
<entityProvider>
<name>PhaseMilestones</name>
<fieldType>DEPENDENCY_IN</fieldType>
<dependencies>
<entityDependency>
<name>b132527b-990c-416a-b2d6-ddbe6f4397e2</name>
<entityName>Salesproject_entity</entityName>
<fieldName>SalesprojectPhaseMilestones</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
<name>Type_param</name>
<valueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/phasemilestones/children/type_param/valueProcess.js</valueProcess>
<expose v="false" />
</entityParameter>
</children>
</entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
......
import("system.result");
result.string("SalesprojectPhase");
\ No newline at end of file
import("system.result");
result.string("SalesprojectState");
\ No newline at end of file
import("system.vars");
import("system.translate");
import("system.result");
if (vars.exists("$field.TYPE") && vars.get("$field.TYPE"))
{
result.string(translate.text("Milestones") + " " + translate.text(vars.get("$field.TYPE")));
}
else
result.string(translate.text("Milestones"));
\ No newline at end of file
......@@ -3,8 +3,9 @@ import("system.result");
import("system.vars");
import("Sql_lib");
var cond = new SqlCondition();
cond.andPrepareVars("SALESPROJECT_MILESTONE.SALESPROJECT_ID", "$param.SalesprojectId_param");
var cond = SqlCondition.begin()
.andPrepareVars("SALESPROJECT_MILESTONE.SALESPROJECT_ID", "$param.SalesprojectId_param")
.andPrepareVars("SALESPROJECT_MILESTONE.TYPE", "$param.Type_param");
//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
import("system.vars");
import("system.translate");
import("system.result");
if (vars.exists("$field.TYPE") && vars.get("$field.TYPE"))
{
result.string(translate.text("Milestones") + " " + translate.text(vars.get("$field.TYPE")));
}
else
result.string(translate.text("Milestones"));
\ No newline at end of file
......@@ -135,18 +135,18 @@
</children>
</entityConsumer>
<entityConsumer>
<name>SalesprojectMilestones</name>
<name>SalesprojectPhaseMilestones</name>
<title>Milestone</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>SalesprojectMilestone_entity</entityName>
<fieldName>SalesprojectMilestones</fieldName>
<fieldName>PhaseMilestones</fieldName>
</dependency>
<children>
<entityParameter>
<name>SalesprojectId_param</name>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectmilestones/children/salesprojectid_param/valueProcess.js</valueProcess>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectphasemilestones/children/salesprojectid_param/valueProcess.js</valueProcess>
<triggerRecalculation v="true" />
</entityParameter>
</children>
......@@ -547,6 +547,15 @@
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityConsumer>
<name>SalesprojectStateMilestones</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>SalesprojectMilestone_entity</entityName>
<fieldName>StateMilestones</fieldName>
</dependency>
</entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
......
......@@ -26,5 +26,9 @@
<name>c35cc718-94a8-43cf-afe4-f02d251d4e9f</name>
<view>SalesprojectEdit_view</view>
</neonViewReference>
<neonViewReference>
<name>9d4603e0-6e0e-4c9e-af97-f5c059debe9e</name>
<view>SalesprojectMilestone_view</view>
</neonViewReference>
</references>
</neonContext>
......@@ -29,10 +29,10 @@
<entityField>SalesprojectForecasts</entityField>
<view>SalesprojectForecastFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>349a82ad-4a83-4718-b37e-b0adf1ddb0b2</name>
<entityField>SalesprojectMilestones</entityField>
<view>SalesprojectMilestoneChart_view</view>
<neonViewReference>
<name>8986df12-88fc-49a8-9e48-f4c1f371532f</name>
<entityField>#ENTITY</entityField>
<view>SalesprojectMilestone_view</view>
</neonViewReference>
<neonViewReference>
<name>5d7248e8-3f3e-4262-8f13-6d5eff7165c1</name>
......
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>SalesprojectMilestone_view</name>
<title>Milestones</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
<name>layout</name>
</boxLayout>
</layout>
<children>
<neonViewReference>
<name>30c775ea-7488-4dfd-8e6d-c65b7982849d</name>
<entityField>SalesprojectStateMilestones</entityField>
<view>SalesprojectMilestoneChart_view</view>
</neonViewReference>
<neonViewReference>
<name>cc8f1469-805f-4e2c-aa4f-d55f932c6deb</name>
<entityField>SalesprojectPhaseMilestones</entityField>
<view>SalesprojectMilestoneChart_view</view>
</neonViewReference>
</children>
</neonView>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment