diff --git a/.liquibase/Data_alias/basic/2019.2/AditoBasic/salesprojectsource_add_icon_attr.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/salesprojectsource_add_icon_attr.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a8099715835eb541392625c9c63b1cf7e6bf9210
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.2/AditoBasic/salesprojectsource_add_icon_attr.xml
@@ -0,0 +1,37 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="s.leierseder" id="49ca80b4-7735-4300-8603-6761672b2048">
+ <insert tableName="AB_KEYWORD_ATTRIBUTE">
+ <column name="AB_KEYWORD_ATTRIBUTEID" value="4b05ec8a-6964-40e5-8713-0043ca926eb6"/>
+
+ <column name="NAME" value="defaultAvatarRepresentation"/>
+ <column name="CONTAINER" value="SalesprojectSource"/>
+ <column name="TYPE" value="CHAR_VALUE"/>
+ </insert>
+
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="4a6b782b-1b15-45d7-9acb-831312d3f745"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="f83c96e3-47be-4ca1-bc47-4a3a2fce7fca"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="4b05ec8a-6964-40e5-8713-0043ca926eb6"/>
+ <column name="CHAR_VALUE" value="VAADIN:GLOBE_WIRE"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="f3b79959-00e3-4361-b042-6c179dc6cbca"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="1a197ade-0c61-4643-8287-159719d519b4"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="4b05ec8a-6964-40e5-8713-0043ca926eb6"/>
+ <column name="CHAR_VALUE" value="VAADIN:HOME"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="54c417d8-e567-41ae-8d56-277559f7b023"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="f552b84a-b8e7-472a-9ce5-d64e7f14e74b"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="4b05ec8a-6964-40e5-8713-0043ca926eb6"/>
+ <column name="CHAR_VALUE" value="VAADIN:HOME"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="a6157376-f0af-49f2-b55e-5c0acc331742"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="7ea06933-94c9-4a05-ba7d-4266df9e4ab2"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="4b05ec8a-6964-40e5-8713-0043ca926eb6"/>
+ <column name="CHAR_VALUE" value="VAADIN:SHOP"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.2/changelog.xml b/.liquibase/Data_alias/basic/2019.2/changelog.xml
index 6a8b6d83ebb21a5f047c35ffe8e309fb1def5463..f60e39442e100c3478cbe11cf7cf19d879ea8629 100644
--- a/.liquibase/Data_alias/basic/2019.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2019.2/changelog.xml
@@ -184,4 +184,7 @@
<include relativeToChangelogFile="true" file="Ticketmanagement/insertTicketAttributes_TaskType_Task.xml"/>
<include relativeToChangelogFile="true" file="Ticketmanagement/insert_TaskType_Task.xml"/>
<include relativeToChangelogFile="true" file="Ticketmanagement/update_TaskStatus_add_icon.xml"/>
+
+ <include relativeToChangelogFile="true" file="AditoBasic/salesprojectsource_add_icon_attr.xml"/>
+
</databaseChangeLog>
diff --git a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
index 03cc3287db23e600e8c8005c7efda439cd2e6c82..eb599011b163d94c4ea7c68d8da0f249c2227428 100644
--- a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
+++ b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
@@ -3,6 +3,7 @@
<name>SalesprojectSource_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Touchpoint</title>
+ <iconId>VAADIN:HANDSHAKE</iconId>
<titlePlural>Touchpoints</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
@@ -76,6 +77,11 @@
<title>Information</title>
<contentType>LONG_TEXT</contentType>
</entityField>
+ <entityField>
+ <name>ICON</name>
+ <contentType>IMAGE</contentType>
+ <valueProcess>%aditoprj%/entity/SalesprojectSource_entity/entityfields/icon/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/SalesprojectSource_entity/entityfields/icon/valueProcess.js b/entity/SalesprojectSource_entity/entityfields/icon/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..860f5656a20ddabd85f30a928382bf22de8a81d1
--- /dev/null
+++ b/entity/SalesprojectSource_entity/entityfields/icon/valueProcess.js
@@ -0,0 +1,14 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var category = vars.getString("$field.SOURCE");
+var icon;
+if (category)
+{
+ var keywordAttributes = KeywordUtils.getAttributeRelationsByKey(category, $KeywordRegistry.salesprojectSource())
+ icon = keywordAttributes.defaultAvatarRepresentation;
+ result.string(icon);
+}
diff --git a/entity/Timetracking_entity/entityfields/totaltime/valueProcess.js b/entity/Timetracking_entity/entityfields/totaltime/valueProcess.js
index f798d533836323413129a51f4eb2d1c7c46383c9..a290a185f34580375697ab2d4796d54ff12a2a7c 100644
--- a/entity/Timetracking_entity/entityfields/totaltime/valueProcess.js
+++ b/entity/Timetracking_entity/entityfields/totaltime/valueProcess.js
@@ -1,9 +1,7 @@
-import("system.logging");
+import("system.db");
import("system.vars");
import("system.result");
-var minutes = vars.get("$field.MINUTES");
+var minutes = db.cell("select sum(MINUTES) from TIMETRACKING");
-logging.log(minutes);
-
-result.string("120");
\ No newline at end of file
+result.string(minutes);
\ No newline at end of file
diff --git a/neonView/SalesprojectClassificationAttribute_view/SalesprojectClassificationAttribute_view.aod b/neonView/SalesprojectClassificationAttribute_view/SalesprojectClassificationAttribute_view.aod
index 999b5e45da7a479e2c780a685e6b5bda7d640407..3eeaf9dcdfd46cbe4f0dc6741ef7df459aa1abb5 100644
--- a/neonView/SalesprojectClassificationAttribute_view/SalesprojectClassificationAttribute_view.aod
+++ b/neonView/SalesprojectClassificationAttribute_view/SalesprojectClassificationAttribute_view.aod
@@ -6,9 +6,8 @@
<layout>
<boxLayout>
<name>layout</name>
- <direction>HORIZONTAL</direction>
+ <direction>VERTICAL</direction>
<maxDirectionElements v="2" />
- <autoHeight v="false" />
</boxLayout>
</layout>
<children>
diff --git a/neonView/SalesprojectMemberActivity_view/SalesprojectMemberActivity_view.aod b/neonView/SalesprojectMemberActivity_view/SalesprojectMemberActivity_view.aod
index 61aab30c8e5f83852b07207f442706ea26c7df6e..97d0bf8e350a4236539d53af6fe6968c81d70126 100644
--- a/neonView/SalesprojectMemberActivity_view/SalesprojectMemberActivity_view.aod
+++ b/neonView/SalesprojectMemberActivity_view/SalesprojectMemberActivity_view.aod
@@ -12,15 +12,15 @@
</boxLayout>
</layout>
<children>
- <neonViewReference>
- <name>5e9b2286-227e-494d-a252-be29a50a093a</name>
- <entityField>Activities</entityField>
- <view>ActivityDrawer_view</view>
- </neonViewReference>
<neonViewReference>
<name>ebf752f4-653d-4de3-9c81-c3e6ef692c48</name>
<entityField>Members</entityField>
<view>MemberDrawer_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>5e9b2286-227e-494d-a252-be29a50a093a</name>
+ <entityField>Activities</entityField>
+ <view>ActivityDrawer_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod b/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod
index 0eec99119e8bc6ba057024f7badf812c5502ce04..00440c6f2a3a5ec1a24f67a96c148d7300aaf2ab 100644
--- a/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod
+++ b/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod
@@ -14,6 +14,10 @@
<autoNewRow v="true" />
<entityField>#ENTITY</entityField>
<columns>
+ <neonTableColumn>
+ <name>03bb4d6e-0371-4175-aaa2-43d43bd4ff60</name>
+ <entityField>ICON</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>4931127b-117d-4b1c-81ba-81ac2162f1b7</name>
<entityField>ENTRYDATE</entityField>