From 05d2919519c876d0719b7f4a2d264f6e474279f8 Mon Sep 17 00:00:00 2001 From: Sophia Leierseder <s.leierseder@adito.de> Date: Tue, 11 Jun 2019 11:06:00 +0200 Subject: [PATCH] graphic salesproject timetracking --- .../Timetracking_entity.aod | 1 + neonContext/Timetracking/Timetracking.aod | 4 ++++ .../SalesprojectFurtherInfo_view.aod | 4 ++-- .../TimetrackingAnalyses_view.aod | 20 +++++++++++++++++++ .../TimetrackingScore_view.aod | 5 +++++ 5 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 neonView/TimetrackingAnalyses_view/TimetrackingAnalyses_view.aod diff --git a/entity/Timetracking_entity/Timetracking_entity.aod b/entity/Timetracking_entity/Timetracking_entity.aod index d77b640294..62144c8027 100644 --- a/entity/Timetracking_entity/Timetracking_entity.aod +++ b/entity/Timetracking_entity/Timetracking_entity.aod @@ -104,6 +104,7 @@ <entityField> <name>TOTALTIME</name> <title>Total time</title> + <color>$priority-low-color</color> <valueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/totaltime/valueProcess.js</valueProcess> <displayValueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/totaltime/displayValueProcess.js</displayValueProcess> </entityField> diff --git a/neonContext/Timetracking/Timetracking.aod b/neonContext/Timetracking/Timetracking.aod index 7eec1fc3f4..fb59e69461 100644 --- a/neonContext/Timetracking/Timetracking.aod +++ b/neonContext/Timetracking/Timetracking.aod @@ -27,5 +27,9 @@ <name>069607bf-ed69-494c-bbe4-399bb51298ca</name> <view>TimetrackingScore_view</view> </neonViewReference> + <neonViewReference> + <name>9dcc5766-f0ac-4c7e-8b93-0ea5b648a1ac</name> + <view>TimetrackingAnalyses_view</view> + </neonViewReference> </references> </neonContext> diff --git a/neonView/SalesprojectFurtherInfo_view/SalesprojectFurtherInfo_view.aod b/neonView/SalesprojectFurtherInfo_view/SalesprojectFurtherInfo_view.aod index a1b37400d5..2aff0cef7c 100644 --- a/neonView/SalesprojectFurtherInfo_view/SalesprojectFurtherInfo_view.aod +++ b/neonView/SalesprojectFurtherInfo_view/SalesprojectFurtherInfo_view.aod @@ -17,9 +17,9 @@ <view>TimetrackingDrawer_view</view> </neonViewReference> <neonViewReference> - <name>afe207b5-475c-4471-b561-3d93487cdf1f</name> + <name>5d00dd5a-7c80-41b4-a53e-29375be4f806</name> <entityField>Timetrackings</entityField> - <view>TimetrackingScore_view</view> + <view>TimetrackingAnalyses_view</view> </neonViewReference> <neonViewReference> <name>4dcc3fdd-6683-435c-95c1-a59597fc3e71</name> diff --git a/neonView/TimetrackingAnalyses_view/TimetrackingAnalyses_view.aod b/neonView/TimetrackingAnalyses_view/TimetrackingAnalyses_view.aod new file mode 100644 index 0000000000..1cba872d7b --- /dev/null +++ b/neonView/TimetrackingAnalyses_view/TimetrackingAnalyses_view.aod @@ -0,0 +1,20 @@ +<?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>TimetrackingAnalyses_view</name> + <majorModelMode>DISTRIBUTED</majorModelMode> + <layout> + <drawerLayout> + <name>layout</name> + <layoutCaption>Time</layoutCaption> + </drawerLayout> + </layout> + <children> + <singleDataChartViewTemplate> + <name>Pie</name> + <chartType>PIE</chartType> + <xAxis>CONTACT_ID</xAxis> + <yAxis>MINUTES</yAxis> + <entityField>#ENTITY</entityField> + </singleDataChartViewTemplate> + </children> +</neonView> diff --git a/neonView/TimetrackingScore_view/TimetrackingScore_view.aod b/neonView/TimetrackingScore_view/TimetrackingScore_view.aod index 546afa817c..a52446d439 100644 --- a/neonView/TimetrackingScore_view/TimetrackingScore_view.aod +++ b/neonView/TimetrackingScore_view/TimetrackingScore_view.aod @@ -2,6 +2,11 @@ <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> + <layout> + <noneLayout> + <name>layout</name> + </noneLayout> + </layout> <children> <scoreCardViewTemplate> <name>time</name> -- GitLab