diff --git a/entity/Forecast_entity/Forecast_entity.aod b/entity/Forecast_entity/Forecast_entity.aod
index 8bf3ee5a9b40ab579250fcc56a46c6edca4a93da..40b28f5d43e04dc8d87378ee45b4c4eb0940eefd 100644
--- a/entity/Forecast_entity/Forecast_entity.aod
+++ b/entity/Forecast_entity/Forecast_entity.aod
@@ -34,6 +34,7 @@
</entityField>
<entityField>
<name>OBJECT_ROWID</name>
+ <title>Connection</title>
<consumer>Objects</consumer>
<linkedContextProcess>%aditoprj%/entity/Forecast_entity/entityfields/object_rowid/linkedContextProcess.js</linkedContextProcess>
<valueProcess>%aditoprj%/entity/Forecast_entity/entityfields/object_rowid/valueProcess.js</valueProcess>
@@ -63,6 +64,7 @@
</entityConsumer>
<entityField>
<name>OBJECT_TYPE</name>
+ <title>Type</title>
<consumer>Contexts</consumer>
<valueProcess>%aditoprj%/entity/Forecast_entity/entityfields/object_type/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Forecast_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
diff --git a/entity/Member_entity/Member_entity.aod b/entity/Member_entity/Member_entity.aod
index 8d043c5a8a818881be86beb2e66263dcad2f3007..10a933ec5362d5b7579f9ae178b616a705efff38 100644
--- a/entity/Member_entity/Member_entity.aod
+++ b/entity/Member_entity/Member_entity.aod
@@ -224,6 +224,11 @@ TODO: intuitive möglichkeit, auf dend Stand aus Relation zurückzusetzen... akt
<contentType>BOOLEAN</contentType>
<dropDownProcess>%aditoprj%/entity/Member_entity/entityfields/decider/dropDownProcess.js</dropDownProcess>
</entityField>
+ <entityField>
+ <name>IMAGE</name>
+ <contentType>IMAGE</contentType>
+ <valueProcess>%aditoprj%/entity/Member_entity/entityfields/image/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Member_entity/entityfields/icon/valueProcess.js b/entity/Member_entity/entityfields/icon/valueProcess.js
index 05a9a85fd7d0f67869b1d86d8c6a9f5a5a1bbeec..a19d7b291a62db0944669f510d766e839377fcdd 100644
--- a/entity/Member_entity/entityfields/icon/valueProcess.js
+++ b/entity/Member_entity/entityfields/icon/valueProcess.js
@@ -1,3 +1,4 @@
+import("system.logging");
import("system.vars");
import("system.result");
import("system.neon");
@@ -6,6 +7,7 @@ import("KeywordRegistry_basic");
var role = vars.get("$field.ROLE");
var isIntern = false, icon;
+
if(role)
{
var keywordAttributes = KeywordUtils.getAttributeRelationsByKey(role, $KeywordRegistry.MemberRole())
@@ -15,4 +17,10 @@ if(role)
if(isIntern)
result.string("VAADIN:STAR");
-else result.string("VAADIN:AIRPLANE");
\ No newline at end of file
+else result.string("VAADIN:AIRPLANE");
+
+//var keywordAttributes = KeywordUtils.getAttributeRelationsByKey(role, $KeywordRegistry.MemberRole());
+//
+//logging.log(keywordAttributes);
+//
+//result.string("VAADIN:AIRPLANE");
\ No newline at end of file
diff --git a/entity/Member_entity/entityfields/image/valueProcess.js b/entity/Member_entity/entityfields/image/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..16100cd9731b680a25cd2a6517eb6eb18e853e92
--- /dev/null
+++ b/entity/Member_entity/entityfields/image/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string("TEXT:" + vars.get("$field.PERSON_FULL_NAME"));
\ No newline at end of file
diff --git a/entity/Timetracking_entity/Timetracking_entity.aod b/entity/Timetracking_entity/Timetracking_entity.aod
index 99696a060a4775c562003a3a594d30c31f6da154..d77b640294155a6cc05cb37fa7db7cc1e9d5a8da 100644
--- a/entity/Timetracking_entity/Timetracking_entity.aod
+++ b/entity/Timetracking_entity/Timetracking_entity.aod
@@ -101,6 +101,12 @@
<fieldName>Employees</fieldName>
</dependency>
</entityConsumer>
+ <entityField>
+ <name>TOTALTIME</name>
+ <title>Total time</title>
+ <valueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/totaltime/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/totaltime/displayValueProcess.js</displayValueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Timetracking_entity/entityfields/totaltime/displayValueProcess.js b/entity/Timetracking_entity/entityfields/totaltime/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8512eee2ee5f8894587fa80b179e20ccdae30373
--- /dev/null
+++ b/entity/Timetracking_entity/entityfields/totaltime/displayValueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+import("Timetracking_lib");
+
+result.string(Timetracking.minutesToReadableHour(parseInt(vars.getString("$field.TOTALTIME"))));
\ No newline at end of file
diff --git a/entity/Timetracking_entity/entityfields/totaltime/valueProcess.js b/entity/Timetracking_entity/entityfields/totaltime/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f798d533836323413129a51f4eb2d1c7c46383c9
--- /dev/null
+++ b/entity/Timetracking_entity/entityfields/totaltime/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.logging");
+import("system.vars");
+import("system.result");
+
+var minutes = vars.get("$field.MINUTES");
+
+logging.log(minutes);
+
+result.string("120");
\ No newline at end of file
diff --git a/neonContext/Salesproject/Salesproject.aod b/neonContext/Salesproject/Salesproject.aod
index e222c4057e3b1d375e15ca06a4829fa4acf9b684..4df9f081fdbd16330251517c5e525e69a09d4550 100644
--- a/neonContext/Salesproject/Salesproject.aod
+++ b/neonContext/Salesproject/Salesproject.aod
@@ -48,7 +48,7 @@
</neonViewReference>
<neonViewReference>
<name>d878f3b7-1de6-4319-93c7-0fff621c0458</name>
- <view>SalesprojectTimeDocComp_view</view>
+ <view>SalesprojectFurtherInfo_view</view>
</neonViewReference>
<neonViewReference>
<name>68e9257b-d402-4edc-8345-7da46c3b63f9</name>
diff --git a/neonContext/Timetracking/Timetracking.aod b/neonContext/Timetracking/Timetracking.aod
index 72386c6a08a480cb48e2a1513e25880dcf5eb81e..7eec1fc3f4fef8a569637d1a1487caa0245bc781 100644
--- a/neonContext/Timetracking/Timetracking.aod
+++ b/neonContext/Timetracking/Timetracking.aod
@@ -23,5 +23,9 @@
<name>1afcd6f9-1692-4df7-b514-32c1db2f7dd1</name>
<view>TimetrackingDrawer_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>069607bf-ed69-494c-bbe4-399bb51298ca</name>
+ <view>TimetrackingScore_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonView/ClassificationDrawer_view/ClassificationDrawer_view.aod b/neonView/ClassificationDrawer_view/ClassificationDrawer_view.aod
index 4f3c0065ecf038cd2d66c0ee3aefbeef34ef2451..bf5c00139312d39c09ff953040f9051d947b06a4 100644
--- a/neonView/ClassificationDrawer_view/ClassificationDrawer_view.aod
+++ b/neonView/ClassificationDrawer_view/ClassificationDrawer_view.aod
@@ -10,7 +10,7 @@
</layout>
<children>
<neonViewReference>
- <name>be8f5d17-80ab-49c4-8153-f90aa23667cd</name>
+ <name>ddde18ed-2617-4f7e-9a6b-71e4625e2cdc</name>
<entityField>#ENTITY</entityField>
<view>ClassificationTree_view</view>
</neonViewReference>
diff --git a/neonView/CompetitionFilter_view/CompetitionFilter_view.aod b/neonView/CompetitionFilter_view/CompetitionFilter_view.aod
index c48e69551e83641f2ca6a28c4da6b8f51b2c4e6a..ee11fb7b578a391278031ea436d0dc069118646e 100644
--- a/neonView/CompetitionFilter_view/CompetitionFilter_view.aod
+++ b/neonView/CompetitionFilter_view/CompetitionFilter_view.aod
@@ -14,6 +14,10 @@
<autoNewRow v="true" />
<entityField>#ENTITY</entityField>
<columns>
+ <neonTableColumn>
+ <name>dd971a3f-297e-4055-9961-77faea60236e</name>
+ <entityField>IMAGE</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>47821fb3-d178-4a54-9ec4-d78232e9b4de</name>
<entityField>CONTACT_ID</entityField>
diff --git a/neonView/ForecastPreview_view/ForecastPreview_view.aod b/neonView/ForecastPreview_view/ForecastPreview_view.aod
index 7e6bbac9e4a08e144b3c23f17c79fb3d3775ceb3..15dd0b69ad006af106d3ecc1b99c97559e07ee96 100644
--- a/neonView/ForecastPreview_view/ForecastPreview_view.aod
+++ b/neonView/ForecastPreview_view/ForecastPreview_view.aod
@@ -16,7 +16,7 @@
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
- <name>Info</name>
+ <name>Detail</name>
<showDrawer v="true" />
<drawerCaption>Details</drawerCaption>
<entityField>#ENTITY</entityField>
@@ -26,7 +26,23 @@
<entityField>VOLUME</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>745f1f28-49a0-4c35-9c1a-e442d15716dc</name>
+ <name>7261d58e-7534-4877-b5cd-f05201823711</name>
+ <entityField>OBJECT_TYPE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>af76713a-9f84-4f5c-965f-eba5c5ca3abc</name>
+ <entityField>OBJECT_ROWID</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <genericViewTemplate>
+ <name>Info</name>
+ <showDrawer v="true" />
+ <drawerCaption>Description</drawerCaption>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>c2c10cf6-0ae8-4895-8160-766a845b5d17</name>
<entityField>INFO</entityField>
</entityFieldLink>
</fields>
diff --git a/neonView/MemberFilter_view/MemberFilter_view.aod b/neonView/MemberFilter_view/MemberFilter_view.aod
index 6a719214fa3920b2d2d60bbd6f9304580727a415..6cb554e3122427d6e8490a38aa55d541dd6e2069 100644
--- a/neonView/MemberFilter_view/MemberFilter_view.aod
+++ b/neonView/MemberFilter_view/MemberFilter_view.aod
@@ -14,17 +14,17 @@
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
- <name>8bdd903b-0cd0-4327-bd24-3643d61d3de0</name>
- <entityField>ICON</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>27e658bc-c134-4fef-a3a5-b172852d606e</name>
- <entityField>ORGANISATION_NAME</entityField>
+ <name>8b6b6eeb-6246-414f-95f6-453b71e4a9db</name>
+ <entityField>IMAGE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>59e6aea1-9752-48b5-9d91-43edd0c1d670</name>
<entityField>PERSON_FULL_NAME</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>27e658bc-c134-4fef-a3a5-b172852d606e</name>
+ <entityField>ORGANISATION_NAME</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>bea82980-0639-405a-ab3f-92e45f97090e</name>
<entityField>ROLE</entityField>
diff --git a/neonView/PersonSimpleList_view/PersonSimpleList_view.aod b/neonView/PersonSimpleList_view/PersonSimpleList_view.aod
index 8e19ab83993f99e0cc98e64ff384e70aeeeb4c3c..2a722d60584ebeb2e459d0eb1fbdbcbf062b7bb7 100644
--- a/neonView/PersonSimpleList_view/PersonSimpleList_view.aod
+++ b/neonView/PersonSimpleList_view/PersonSimpleList_view.aod
@@ -2,6 +2,7 @@
<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>PersonSimpleList_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
<layout>
<boxLayout>
<name>layout</name>
diff --git a/neonView/SalesprojectClassificationAttribute_view/SalesprojectClassificationAttribute_view.aod b/neonView/SalesprojectClassificationAttribute_view/SalesprojectClassificationAttribute_view.aod
index ba963eff4b3bda0ad8db55e98f9ac57e3d7aa2ef..999b5e45da7a479e2c780a685e6b5bda7d640407 100644
--- a/neonView/SalesprojectClassificationAttribute_view/SalesprojectClassificationAttribute_view.aod
+++ b/neonView/SalesprojectClassificationAttribute_view/SalesprojectClassificationAttribute_view.aod
@@ -18,8 +18,8 @@
<view>ClassificationDrawer_view</view>
</neonViewReference>
<neonViewReference>
- <name>e54114a1-3031-47f5-b27b-9774fc5225c5</name>
- <entityField>Attributes</entityField>
+ <name>ead8bff9-3870-4956-a89b-19cafecf39fb</name>
+ <entityField>AttributeTree</entityField>
<view>AttributeRelationTreeDrawer_view</view>
</neonViewReference>
</children>
diff --git a/neonView/SalesprojectTimeDocComp_view/SalesprojectTimeDocComp_view.aod b/neonView/SalesprojectFurtherInfo_view/SalesprojectFurtherInfo_view.aod
similarity index 81%
rename from neonView/SalesprojectTimeDocComp_view/SalesprojectTimeDocComp_view.aod
rename to neonView/SalesprojectFurtherInfo_view/SalesprojectFurtherInfo_view.aod
index 770985b37d98c8663bce5182ea1ab133a5139718..a1b37400d5361b0eccd8915bca41f7575d50f58c 100644
--- a/neonView/SalesprojectTimeDocComp_view/SalesprojectTimeDocComp_view.aod
+++ b/neonView/SalesprojectFurtherInfo_view/SalesprojectFurtherInfo_view.aod
@@ -1,6 +1,6 @@
<?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>SalesprojectTimeDocComp_view</name>
+ <name>SalesprojectFurtherInfo_view</name>
<title>Further informations</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
@@ -17,9 +17,9 @@
<view>TimetrackingDrawer_view</view>
</neonViewReference>
<neonViewReference>
- <name>baccab92-37f1-4a33-9662-771323996adf</name>
- <entityField>Documents</entityField>
- <view>DocumentDrawer_view</view>
+ <name>afe207b5-475c-4471-b561-3d93487cdf1f</name>
+ <entityField>Timetrackings</entityField>
+ <view>TimetrackingScore_view</view>
</neonViewReference>
<neonViewReference>
<name>4dcc3fdd-6683-435c-95c1-a59597fc3e71</name>
diff --git a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
index 59e488bb5584cfbd0750e8381fe34fb26f7d37bf..8b58e0dd24dacd239b4711822952bbc1b3363399 100644
--- a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
+++ b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
@@ -35,9 +35,14 @@
<view>SalesprojectOfferForecast_view</view>
</neonViewReference>
<neonViewReference>
- <name>1ff890f4-58e1-441f-a714-1faabbf3744b</name>
+ <name>aa801bbd-df49-419b-959a-1664b2c31274</name>
<entityField>#ENTITY</entityField>
- <view>SalesprojectTimeDocComp_view</view>
+ <view>SalesprojectFurtherInfo_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>ccdbb3f1-6b18-4cdd-a0cb-22d8bddd7150</name>
+ <entityField>Documents</entityField>
+ <view>DocumentFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>6ed5fc92-1056-418f-a0b7-3d55414efe3a</name>
diff --git a/neonView/TimetrackingPreview_view/TimetrackingPreview_view.aod b/neonView/TimetrackingPreview_view/TimetrackingPreview_view.aod
index bbd4c498bd926c7c73a75d483b9a360dd4d012e2..1ef0b41db42040c914b5bfc041ba6878cdfe2399 100644
--- a/neonView/TimetrackingPreview_view/TimetrackingPreview_view.aod
+++ b/neonView/TimetrackingPreview_view/TimetrackingPreview_view.aod
@@ -9,25 +9,33 @@
</layout>
<children>
<genericViewTemplate>
- <name>TimetrackingInfo_template</name>
+ <name>Details</name>
<showDrawer v="true" />
- <drawerCaption>Information</drawerCaption>
+ <drawerCaption>Details</drawerCaption>
<entityField>#ENTITY</entityField>
<fields>
- <entityFieldLink>
- <name>64005996-e735-4c5d-bdb7-29aaf8851107</name>
- <entityField>DATE</entityField>
- </entityFieldLink>
<entityFieldLink>
<name>835197c0-2e0c-4989-8d5b-80ccd064d55e</name>
<entityField>CONTACT_ID</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>64005996-e735-4c5d-bdb7-29aaf8851107</name>
+ <entityField>DATE</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>25921a31-5563-4a74-aa7e-67d660c60f0b</name>
<entityField>MINUTES</entityField>
</entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <genericViewTemplate>
+ <name>Info</name>
+ <showDrawer v="true" />
+ <drawerCaption>Description</drawerCaption>
+ <entityField>#ENTITY</entityField>
+ <fields>
<entityFieldLink>
- <name>54123bdf-3008-4597-9f30-fc2877a274f7</name>
+ <name>76a33027-65cc-4943-8e96-20b35880a3cd</name>
<entityField>INFO</entityField>
</entityFieldLink>
</fields>
diff --git a/neonView/TimetrackingScore_view/TimetrackingScore_view.aod b/neonView/TimetrackingScore_view/TimetrackingScore_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..546afa817caefd6052eadd2bf26a5bb1da64a141
--- /dev/null
+++ b/neonView/TimetrackingScore_view/TimetrackingScore_view.aod
@@ -0,0 +1,17 @@
+<?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>TimetrackingScore_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <children>
+ <scoreCardViewTemplate>
+ <name>time</name>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>56f043bf-6ff2-45c0-af48-1c4bf16456cf</name>
+ <entityField>TOTALTIME</entityField>
+ </entityFieldLink>
+ </fields>
+ </scoreCardViewTemplate>
+ </children>
+</neonView>