additional changes salesproject

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>

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>

entity/Member_entity/entityfields/icon/valueProcess.js

+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");
+else result.string("VAADIN:AIRPLANE");
\ No newline at end of file
+
+//var keywordAttributes = KeywordUtils.getAttributeRelationsByKey(role, $KeywordRegistry.MemberRole());
+//
+//logging.log(keywordAttributes);
+//
+//result.string("VAADIN:AIRPLANE");
\ No newline at end of file

entity/Member_entity/entityfields/image/valueProcess.js

+import("system.vars");
+import("system.result");
+
+result.string("TEXT:" + vars.get("$field.PERSON_FULL_NAME"));
\ No newline at end of file

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>

entity/Timetracking_entity/entityfields/totaltime/displayValueProcess.js

+import("system.vars");
+import("system.result");
+import("Timetracking_lib");
+
+result.string(Timetracking.minutesToReadableHour(parseInt(vars.getString("$field.TOTALTIME"))));
\ No newline at end of file

entity/Timetracking_entity/entityfields/totaltime/valueProcess.js

+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

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>

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>

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>

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>

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>

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>

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>

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>

neonView/SalesprojectTimeDocComp_view/SalesprojectTimeDocComp_view.aod → neonView/SalesprojectFurtherInfo_view/SalesprojectFurtherInfo_view.aod

 <?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>

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>

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>

neonView/TimetrackingScore_view/TimetrackingScore_view.aod

+<?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>