From 797fef686d61c974ee42cff4915492cf8356959e Mon Sep 17 00:00:00 2001
From: "d.buechler" <d.buechler@adito.de>
Date: Tue, 16 Jul 2019 16:55:32 +0200
Subject: [PATCH] Properties beim Gantt ViewTemplate wurden umbenannt. Der
RecordContainer setzt nun bei gruppierten Kampagnen auch Start und Enddatum
---
.../jditorecordcontainer/contentProcess.js | 7 +++++--
.../CampaignPlanning_view/CampaignPlanning_view.aod | 10 +++++-----
.../CampaignStepsGantt_view.aod | 9 ++++-----
.../SalesprojectMilestoneInfo_view.aod | 6 +++---
4 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/entity/CampaignPlanning_entity/recordcontainers/jditorecordcontainer/contentProcess.js b/entity/CampaignPlanning_entity/recordcontainers/jditorecordcontainer/contentProcess.js
index 10be5d02fd..a568a49afc 100644
--- a/entity/CampaignPlanning_entity/recordcontainers/jditorecordcontainer/contentProcess.js
+++ b/entity/CampaignPlanning_entity/recordcontainers/jditorecordcontainer/contentProcess.js
@@ -4,6 +4,7 @@ import("system.db");
import("system.result");
import("system.vars");
import("Sql_lib");
+import("Campaign_lib");
var stepCondition = JditoFilterUtils.getSqlCondition(vars.get("local.filter").filter, "CAMPAIGNSTEP");
@@ -30,8 +31,10 @@ var stepsRows = db.table(stepCondition.buildSql(stepsQuery, "", "order by SORTIN
for (var campaignRowIndex in campaignsRows)
{
let campaignRow = campaignsRows[campaignRowIndex];
-
- resultRay.push([campaignRow[UID], campaignRow[CAMPAIGNNAME], null, null, null, null, campaignRow[UID], TARGET_CONTEXT_ROOT_ELEMENT]);
+ let startDate = CampaignUtils.getCampaignStartDate(campaignRow[UID]);
+ let endDate = CampaignUtils.getCampaignEndDate(campaignRow[UID]);
+
+ resultRay.push([campaignRow[UID], campaignRow[CAMPAIGNNAME], null, null, startDate, endDate, campaignRow[UID], TARGET_CONTEXT_ROOT_ELEMENT]);
}
/*
diff --git a/neonView/CampaignPlanning_view/CampaignPlanning_view.aod b/neonView/CampaignPlanning_view/CampaignPlanning_view.aod
index 7f29750673..f08a06250f 100644
--- a/neonView/CampaignPlanning_view/CampaignPlanning_view.aod
+++ b/neonView/CampaignPlanning_view/CampaignPlanning_view.aod
@@ -12,13 +12,13 @@
<children>
<ganttViewTemplate>
<name>AllCampaignsOverviewGantt</name>
- <beginDateField>DATE_START</beginDateField>
- <endDateField>DATE_END</endDateField>
+ <groupByRootElements v="true" />
+ <uidField>UID</uidField>
<titleField>NAME</titleField>
<descriptionField>STEP_DESCRIPTION</descriptionField>
- <uidField>UID</uidField>
- <stepPredecessorIdField>PREDECESSOR_STEP_ID</stepPredecessorIdField>
- <displayRootElementsAsGroupHeaders v="true" />
+ <beginDateField>DATE_START</beginDateField>
+ <endDateField>DATE_END</endDateField>
+ <predecessorIdField>PREDECESSOR_STEP_ID</predecessorIdField>
<favoriteActionGroup2>NewGanttEntries</favoriteActionGroup2>
<entityField>#ENTITY</entityField>
<isEditable v="true" />
diff --git a/neonView/CampaignStepsGantt_view/CampaignStepsGantt_view.aod b/neonView/CampaignStepsGantt_view/CampaignStepsGantt_view.aod
index 08d0a1a6f4..50876f5dd0 100644
--- a/neonView/CampaignStepsGantt_view/CampaignStepsGantt_view.aod
+++ b/neonView/CampaignStepsGantt_view/CampaignStepsGantt_view.aod
@@ -12,13 +12,12 @@
<children>
<ganttViewTemplate>
<name>StepsGantt</name>
- <beginDateField>DATE_START</beginDateField>
- <endDateField>DATE_END</endDateField>
+ <uidField>CAMPAIGNSTEPID</uidField>
<titleField>NAME</titleField>
<descriptionField>DESCRIPTION</descriptionField>
- <uidField>CAMPAIGNSTEPID</uidField>
- <stepPredecessorIdField>PREDECESSORSTEP_ID</stepPredecessorIdField>
- <displayRootElementsAsGroupHeaders v="false" />
+ <beginDateField>DATE_START</beginDateField>
+ <endDateField>DATE_END</endDateField>
+ <predecessorIdField>PREDECESSORSTEP_ID</predecessorIdField>
<entityField>#ENTITY</entityField>
<isCreatable v="true" />
<isEditable v="true" />
diff --git a/neonView/SalesprojectMilestoneInfo_view/SalesprojectMilestoneInfo_view.aod b/neonView/SalesprojectMilestoneInfo_view/SalesprojectMilestoneInfo_view.aod
index abbe9ef163..6d883a47a3 100644
--- a/neonView/SalesprojectMilestoneInfo_view/SalesprojectMilestoneInfo_view.aod
+++ b/neonView/SalesprojectMilestoneInfo_view/SalesprojectMilestoneInfo_view.aod
@@ -10,11 +10,11 @@
<children>
<ganttViewTemplate>
<name>MilestoneGantt</name>
+ <uidField>SALESPROJECT_MILESTONEID</uidField>
+ <titleField>VALUE</titleField>
<beginDateField>DATE_START</beginDateField>
<endDateField>dateEndGantt</endDateField>
- <titleField>valueLongName</titleField>
- <uidField>SALESPROJECT_MILESTONEID</uidField>
- <stepPredecessorIdField>PARENT_ID</stepPredecessorIdField>
+ <predecessorIdField>PARENT_ID</predecessorIdField>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
--
GitLab