From d9e11fccd62b2a3b0d548b81bf156d9533828433 Mon Sep 17 00:00:00 2001
From: Sophia Leierseder <s.leierseder@adito.de>
Date: Fri, 7 Jun 2019 08:51:45 +0200
Subject: [PATCH] Translation and saleproject fixes
---
.../SalesprojectSource_entity.aod | 15 ++++++----
neonContext/Salesproject/Salesproject.aod | 4 +++
.../SalesprojectClassScoreAttribute_view.aod | 29 +++++++++++++++++++
...lesprojectClassificationAttribute_view.aod | 2 +-
.../SalesprojectMain_view.aod | 4 +--
.../SalesprojectMemberActivity_view.aod | 4 ++-
.../SalesprojectMilestoneSource_view.aod | 2 +-
.../SalesprojectOfferForecast_view.aod | 2 +-
.../SalesprojectSourceFilter_view.aod | 2 +-
9 files changed, 51 insertions(+), 13 deletions(-)
create mode 100644 neonView/SalesprojectClassScoreAttribute_view/SalesprojectClassScoreAttribute_view.aod
diff --git a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
index f443b20ebe..03cc3287db 100644
--- a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
+++ b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
@@ -40,8 +40,6 @@
<contentType>DATE</contentType>
<resolution>DAY</resolution>
<outputFormat>dd.MM.yyyy</outputFormat>
- <title>Information</title>
- <contentType>LONG_TEXT</contentType>
</entityField>
<entityField>
<name>SALESPROJECT_ID</name>
@@ -73,6 +71,11 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityField>
+ <name>INFO</name>
+ <title>Information</title>
+ <contentType>LONG_TEXT</contentType>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -93,10 +96,6 @@
<name>ENTRYDATE.value</name>
<recordfield>SALESPROJECT_SOURCE.ENTRYDATE</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>INFO.value</name>
- <recordfield>SALESPROJECT_SOURCE.INFO</recordfield>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>SALESPROJECT_ID.value</name>
<recordfield>SALESPROJECT_SOURCE.SALESPROJECT_ID</recordfield>
@@ -113,6 +112,10 @@
<name>SOURCE.displayValue</name>
<expression>%aditoprj%/entity/SalesprojectSource_entity/recordcontainers/db/recordfieldmappings/source.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>INFO.value</name>
+ <recordfield>SALESPROJECT_SOURCE.INFO</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/neonContext/Salesproject/Salesproject.aod b/neonContext/Salesproject/Salesproject.aod
index a7d8eda383..e222c4057e 100644
--- a/neonContext/Salesproject/Salesproject.aod
+++ b/neonContext/Salesproject/Salesproject.aod
@@ -54,5 +54,9 @@
<name>68e9257b-d402-4edc-8345-7da46c3b63f9</name>
<view>SalesprojectClassificationAttribute_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>99f70216-c195-4c08-a6ab-3a4d5acc759b</name>
+ <view>SalesprojectClassScoreAttribute_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonView/SalesprojectClassScoreAttribute_view/SalesprojectClassScoreAttribute_view.aod b/neonView/SalesprojectClassScoreAttribute_view/SalesprojectClassScoreAttribute_view.aod
new file mode 100644
index 0000000000..b4be33213f
--- /dev/null
+++ b/neonView/SalesprojectClassScoreAttribute_view/SalesprojectClassScoreAttribute_view.aod
@@ -0,0 +1,29 @@
+<?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>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <scoreCardViewTemplate>
+ <name>ClassificationScore</name>
+ <entityField>#ENTITY</entityField>
+ <title>Classification score</title>
+ <fields>
+ <entityFieldLink>
+ <name>14afcf9d-d168-4962-8503-8d590b994b62</name>
+ <entityField>ClassificationResult</entityField>
+ </entityFieldLink>
+ </fields>
+ </scoreCardViewTemplate>
+ <neonViewReference>
+ <name>1af0e58c-db49-41c3-b7ce-d69498070699</name>
+ <entityField>#ENTITY</entityField>
+ <view>SalesprojectClassificationAttribute_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/SalesprojectClassificationAttribute_view/SalesprojectClassificationAttribute_view.aod b/neonView/SalesprojectClassificationAttribute_view/SalesprojectClassificationAttribute_view.aod
index 12ee08acd9..ba963eff4b 100644
--- a/neonView/SalesprojectClassificationAttribute_view/SalesprojectClassificationAttribute_view.aod
+++ b/neonView/SalesprojectClassificationAttribute_view/SalesprojectClassificationAttribute_view.aod
@@ -1,7 +1,7 @@
<?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>Bewertung</title>
+ <title></title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
diff --git a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
index b10c6e5499..59e488bb55 100644
--- a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
+++ b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
@@ -25,9 +25,9 @@
<view>SalesprojectMilestoneSource_view</view>
</neonViewReference>
<neonViewReference>
- <name>1cd0f7cc-bda9-40b1-ba46-7bdd28c0bef2</name>
+ <name>67659a20-068f-4522-ad33-2c35e29f929a</name>
<entityField>#ENTITY</entityField>
- <view>SalesprojectClassificationAttribute_view</view>
+ <view>SalesprojectClassScoreAttribute_view</view>
</neonViewReference>
<neonViewReference>
<name>16ef2fde-0b5f-4545-b065-80738b2388fc</name>
diff --git a/neonView/SalesprojectMemberActivity_view/SalesprojectMemberActivity_view.aod b/neonView/SalesprojectMemberActivity_view/SalesprojectMemberActivity_view.aod
index fbe4c90ef7..61aab30c8e 100644
--- a/neonView/SalesprojectMemberActivity_view/SalesprojectMemberActivity_view.aod
+++ b/neonView/SalesprojectMemberActivity_view/SalesprojectMemberActivity_view.aod
@@ -1,11 +1,13 @@
<?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>SalesprojectMemberActivity_view</name>
- <title>Projektteam und Aktivitäten</title>
+ <title>Activities</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
<name>layout</name>
+ <direction>VERTICAL</direction>
+ <maxDirectionElements v="0" />
<autoHeight v="false" />
</boxLayout>
</layout>
diff --git a/neonView/SalesprojectMilestoneSource_view/SalesprojectMilestoneSource_view.aod b/neonView/SalesprojectMilestoneSource_view/SalesprojectMilestoneSource_view.aod
index af24daab68..d6fe201f6f 100644
--- a/neonView/SalesprojectMilestoneSource_view/SalesprojectMilestoneSource_view.aod
+++ b/neonView/SalesprojectMilestoneSource_view/SalesprojectMilestoneSource_view.aod
@@ -1,7 +1,7 @@
<?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>SalesprojectMilestoneSource_view</name>
- <title>Meilensteine und Kontaktpunkte</title>
+ <title>Milestones</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
diff --git a/neonView/SalesprojectOfferForecast_view/SalesprojectOfferForecast_view.aod b/neonView/SalesprojectOfferForecast_view/SalesprojectOfferForecast_view.aod
index 1dd424987f..3352fab362 100644
--- a/neonView/SalesprojectOfferForecast_view/SalesprojectOfferForecast_view.aod
+++ b/neonView/SalesprojectOfferForecast_view/SalesprojectOfferForecast_view.aod
@@ -1,7 +1,7 @@
<?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>SalesprojectOfferForecast_view</name>
- <title>Angebot und Forecast</title>
+ <title>Forecast</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
diff --git a/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod b/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod
index f3476905c3..0eec99119e 100644
--- a/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod
+++ b/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod
@@ -23,7 +23,7 @@
<entityField>SOURCE</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>e5660207-7b70-4ac6-b5b5-b87a54d5b032</name>
+ <name>304ed9dd-0f3d-45b2-9195-cc145775f16d</name>
<entityField>INFO</entityField>
</neonTableColumn>
</columns>
--
GitLab