From c5633bd5f97a8b55b7eddc4bcbacf9e319d28507 Mon Sep 17 00:00:00 2001
From: Sophia Leierseder <s.leierseder@adito.de>
Date: Tue, 18 Jun 2019 14:11:57 +0200
Subject: [PATCH] changes tabs salesproject
---
.../CampaignParticipant_entity.aod | 19 +++++++
.../advertisingban_icon/valueProcess.js | 14 ++++++
neonContext/Salesproject/Salesproject.aod | 4 +-
neonContext/Timetracking/Timetracking.aod | 4 ++
...alesprojectClassificationAndChart_view.aod | 25 ++++++++++
...lesprojectClassificationAttribute_view.aod | 49 +++++++++----------
.../SalesprojectFurtherInfo_view.aod | 9 +---
.../SalesprojectMain_view.aod | 2 +-
.../SalesprojectOfferForecast_view.aod | 4 +-
.../TimetrackingDrawer_view.aod | 4 +-
.../TimetrackingFilterAnalyses.aod} | 48 +++++++++---------
11 files changed, 119 insertions(+), 63 deletions(-)
create mode 100644 entity/CampaignParticipant_entity/entityfields/advertisingban_icon/valueProcess.js
create mode 100644 neonView/SalesprojectClassificationAndChart_view/SalesprojectClassificationAndChart_view.aod
rename neonView/{SalesprojectClassScoreAttribute_view/SalesprojectClassScoreAttribute_view.aod => TimetrackingFilterAnalyses/TimetrackingFilterAnalyses.aod} (58%)
diff --git a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
index 19abd33087..8415479efc 100644
--- a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
+++ b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
@@ -179,6 +179,25 @@
<title>Max participants</title>
<displayValueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/campaignstepmaxparticipantcount/displayValueProcess.js</displayValueProcess>
</entityField>
+ <entityField>
+ <name>ADVERTISINGBAN_ICON</name>
+ <contentType>TEXT</contentType>
+ <valueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/advertisingban_icon/valueProcess.js</valueProcess>
+ </entityField>
+ <entityConsumer>
+ <name>ParticipantsCommRestiction</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>CommRestriction_Entity</entityName>
+ <fieldName>PersonsCommRestriction</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <valueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/participantscommrestiction/children/contactid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/CampaignParticipant_entity/entityfields/advertisingban_icon/valueProcess.js b/entity/CampaignParticipant_entity/entityfields/advertisingban_icon/valueProcess.js
new file mode 100644
index 0000000000..07627fcdb5
--- /dev/null
+++ b/entity/CampaignParticipant_entity/entityfields/advertisingban_icon/valueProcess.js
@@ -0,0 +1,14 @@
+import("system.result");
+import("Sql_lib");
+import("system.logging");
+import("system.vars");
+import("system.db");
+
+var contact = vars.get("$field.CONTACT_ID");
+var commres = db.table(SqlCondition.begin()
+ .andPrepareVars("COMMRESTRICTION.CONTACT_ID", "$field.CONTACT_ID")
+ .buildSql("select MEDIUM from COMMRESTRICTION", "1=2"));
+
+logging.log(commres.toSource());
+
+result.string(commres);
diff --git a/neonContext/Salesproject/Salesproject.aod b/neonContext/Salesproject/Salesproject.aod
index 5a44ee47eb..8a1b6992cb 100644
--- a/neonContext/Salesproject/Salesproject.aod
+++ b/neonContext/Salesproject/Salesproject.aod
@@ -52,11 +52,11 @@
</neonViewReference>
<neonViewReference>
<name>68e9257b-d402-4edc-8345-7da46c3b63f9</name>
- <view>SalesprojectClassificationAttribute_view</view>
+ <view>SalesprojectClassificationAndChart_view</view>
</neonViewReference>
<neonViewReference>
<name>99f70216-c195-4c08-a6ab-3a4d5acc759b</name>
- <view>SalesprojectClassScoreAttribute_view</view>
+ <view>SalesprojectClassificationAttribute_view</view>
</neonViewReference>
<neonViewReference>
<name>b3e34681-eef6-48d3-a4e6-975a6fe77e7b</name>
diff --git a/neonContext/Timetracking/Timetracking.aod b/neonContext/Timetracking/Timetracking.aod
index 1cd5118750..899b249d72 100644
--- a/neonContext/Timetracking/Timetracking.aod
+++ b/neonContext/Timetracking/Timetracking.aod
@@ -35,5 +35,9 @@
<name>1290dad5-f796-4847-9510-05607e079f30</name>
<view>TimetrackingAnalysesDrawer_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>9f848d8a-5dee-4388-8ade-6aa2c3f6c21f</name>
+ <view>TimetrackingFilterAnalyses</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonView/SalesprojectClassificationAndChart_view/SalesprojectClassificationAndChart_view.aod b/neonView/SalesprojectClassificationAndChart_view/SalesprojectClassificationAndChart_view.aod
new file mode 100644
index 0000000000..5e697d1cc5
--- /dev/null
+++ b/neonView/SalesprojectClassificationAndChart_view/SalesprojectClassificationAndChart_view.aod
@@ -0,0 +1,25 @@
+<?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>SalesprojectClassificationAndChart_view</name>
+ <title></title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ <direction>HORIZONTAL</direction>
+ <maxDirectionElements v="2" />
+ </boxLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>b2bbddb9-1a44-4926-9707-7052f96e5963</name>
+ <entityField>Classifications</entityField>
+ <view>ClassificationTree_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>0442c345-d0a3-4778-a906-c5ef86dacd16</name>
+ <entityField>Classifications</entityField>
+ <view>ClassificationChart_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/SalesprojectClassificationAttribute_view/SalesprojectClassificationAttribute_view.aod b/neonView/SalesprojectClassificationAttribute_view/SalesprojectClassificationAttribute_view.aod
index bfe23f3323..9ceb8b3663 100644
--- a/neonView/SalesprojectClassificationAttribute_view/SalesprojectClassificationAttribute_view.aod
+++ b/neonView/SalesprojectClassificationAttribute_view/SalesprojectClassificationAttribute_view.aod
@@ -1,25 +1,24 @@
-<?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>SalesprojectClassificationAttribute_view</name>
- <title></title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- <direction>HORIZONTAL</direction>
- <maxDirectionElements v="2" />
- </boxLayout>
- </layout>
- <children>
- <neonViewReference>
- <name>793ed21a-147f-4ca0-a86a-ddbf79db92b6</name>
- <entityField>Classifications</entityField>
- <view>ClassificationDrawer_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>0442c345-d0a3-4778-a906-c5ef86dacd16</name>
- <entityField>Classifications</entityField>
- <view>ClassificationChart_view</view>
- </neonViewReference>
- </children>
-</neonView>
+<?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>SalesprojectClassificationAttribute_view</name>
+ <title>Classification</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ <direction>VERTICAL</direction>
+ </boxLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>1af0e58c-db49-41c3-b7ce-d69498070699</name>
+ <entityField>#ENTITY</entityField>
+ <view>SalesprojectClassificationAndChart_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>523e3855-eade-4cce-842d-9b272b028cbb</name>
+ <entityField>AttributeTree</entityField>
+ <view>AttributeRelationTreeDrawer_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/SalesprojectFurtherInfo_view/SalesprojectFurtherInfo_view.aod b/neonView/SalesprojectFurtherInfo_view/SalesprojectFurtherInfo_view.aod
index 2aff0cef7c..b23e3bfd1d 100644
--- a/neonView/SalesprojectFurtherInfo_view/SalesprojectFurtherInfo_view.aod
+++ b/neonView/SalesprojectFurtherInfo_view/SalesprojectFurtherInfo_view.aod
@@ -6,8 +6,8 @@
<layout>
<boxLayout>
<name>layout</name>
- <direction>HORIZONTAL</direction>
- <maxDirectionElements v="2" />
+ <direction>VERTICAL</direction>
+ <maxDirectionElements v="0" />
</boxLayout>
</layout>
<children>
@@ -16,11 +16,6 @@
<entityField>Timetrackings</entityField>
<view>TimetrackingDrawer_view</view>
</neonViewReference>
- <neonViewReference>
- <name>5d00dd5a-7c80-41b4-a53e-29375be4f806</name>
- <entityField>Timetrackings</entityField>
- <view>TimetrackingAnalyses_view</view>
- </neonViewReference>
<neonViewReference>
<name>4dcc3fdd-6683-435c-95c1-a59597fc3e71</name>
<entityField>Competitions</entityField>
diff --git a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
index 2b26168125..614e3fec5e 100644
--- a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
+++ b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
@@ -27,7 +27,7 @@
<neonViewReference>
<name>67659a20-068f-4522-ad33-2c35e29f929a</name>
<entityField>#ENTITY</entityField>
- <view>SalesprojectClassScoreAttribute_view</view>
+ <view>SalesprojectClassificationAttribute_view</view>
</neonViewReference>
<neonViewReference>
<name>8a83afee-e02c-4714-9641-13b62c95cea1</name>
diff --git a/neonView/SalesprojectOfferForecast_view/SalesprojectOfferForecast_view.aod b/neonView/SalesprojectOfferForecast_view/SalesprojectOfferForecast_view.aod
index 06ec1cd520..ffb635e533 100644
--- a/neonView/SalesprojectOfferForecast_view/SalesprojectOfferForecast_view.aod
+++ b/neonView/SalesprojectOfferForecast_view/SalesprojectOfferForecast_view.aod
@@ -12,9 +12,9 @@
</layout>
<children>
<neonViewReference>
- <name>c399a9ac-e0ad-490c-8ffb-247fc806233b</name>
+ <name>e192d0d6-8d36-437a-a9cf-775c811c2761</name>
<entityField>Forecasts</entityField>
- <view>ForecastDrawer_view</view>
+ <view>ForecastFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>ca2581ac-0987-4fa4-a45a-c33ea4cd61e1</name>
diff --git a/neonView/TimetrackingDrawer_view/TimetrackingDrawer_view.aod b/neonView/TimetrackingDrawer_view/TimetrackingDrawer_view.aod
index eaaa35e643..894a9056ba 100644
--- a/neonView/TimetrackingDrawer_view/TimetrackingDrawer_view.aod
+++ b/neonView/TimetrackingDrawer_view/TimetrackingDrawer_view.aod
@@ -10,9 +10,9 @@
</layout>
<children>
<neonViewReference>
- <name>463458e6-fb6a-4550-b4b4-04b61969f9f2</name>
+ <name>c6133a75-f87d-448f-bf52-e360373aa7f7</name>
<entityField>#ENTITY</entityField>
- <view>TimetrackingFilter_view</view>
+ <view>TimetrackingFilterAnalyses</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/SalesprojectClassScoreAttribute_view/SalesprojectClassScoreAttribute_view.aod b/neonView/TimetrackingFilterAnalyses/TimetrackingFilterAnalyses.aod
similarity index 58%
rename from neonView/SalesprojectClassScoreAttribute_view/SalesprojectClassScoreAttribute_view.aod
rename to neonView/TimetrackingFilterAnalyses/TimetrackingFilterAnalyses.aod
index e7b905232b..92aaadacea 100644
--- a/neonView/SalesprojectClassScoreAttribute_view/SalesprojectClassScoreAttribute_view.aod
+++ b/neonView/TimetrackingFilterAnalyses/TimetrackingFilterAnalyses.aod
@@ -1,24 +1,24 @@
-<?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>SalesprojectClassScoreAttribute_view</name>
- <title>Classification</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- <direction>VERTICAL</direction>
- </boxLayout>
- </layout>
- <children>
- <neonViewReference>
- <name>1af0e58c-db49-41c3-b7ce-d69498070699</name>
- <entityField>#ENTITY</entityField>
- <view>SalesprojectClassificationAttribute_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>523e3855-eade-4cce-842d-9b272b028cbb</name>
- <entityField>AttributeTree</entityField>
- <view>AttributeRelationTreeDrawer_view</view>
- </neonViewReference>
- </children>
-</neonView>
+<?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>TimetrackingFilterAnalyses</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ <direction>HORIZONTAL</direction>
+ <maxDirectionElements v="2" />
+ </boxLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>373d9986-ad06-4a86-9f5d-801ecee6139c</name>
+ <entityField>#ENTITY</entityField>
+ <view>TimetrackingFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>9b1e339c-70aa-4841-8e8f-b66fd2e9f9f5</name>
+ <entityField>#ENTITY</entityField>
+ <view>TimetrackingAnalyses_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
--
GitLab