diff --git a/entity/Timetracking_entity/Timetracking_entity.aod b/entity/Timetracking_entity/Timetracking_entity.aod index 62144c80270d698dbeee409c1b8a0fd0983dfad0..506168abf8cdace750a89a7ce5ffa1f05ba1a780 100644 --- a/entity/Timetracking_entity/Timetracking_entity.aod +++ b/entity/Timetracking_entity/Timetracking_entity.aod @@ -108,6 +108,15 @@ <valueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/totaltime/valueProcess.js</valueProcess> <displayValueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/totaltime/displayValueProcess.js</displayValueProcess> </entityField> + <entityField> + <name>YEAR</name> + <title>Year</title> + <contentType>DATE</contentType> + <outputFormat>yyyy</outputFormat> + <inputFormat>dd.MM.yyyy</inputFormat> + <valueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/year/valueProcess.js</valueProcess> + <displayValueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/year/displayValueProcess.js</displayValueProcess> + </entityField> </entityFields> <recordContainers> <dbRecordContainer> diff --git a/entity/Timetracking_entity/entityfields/year/displayValueProcess.js b/entity/Timetracking_entity/entityfields/year/displayValueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..cca3354bb5c6d32131dc7d447fba92126dc3f590 --- /dev/null +++ b/entity/Timetracking_entity/entityfields/year/displayValueProcess.js @@ -0,0 +1,5 @@ +import("system.result"); +import("system.vars"); +import("system.datetime"); + +result.string(datetime.toDate(vars.get("$field.YEAR"), "MMMM.yyyy")); \ No newline at end of file diff --git a/entity/Timetracking_entity/entityfields/year/valueProcess.js b/entity/Timetracking_entity/entityfields/year/valueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..748a5cd78eae9a53d2f1ca0f4cdc11afa86c21c5 --- /dev/null +++ b/entity/Timetracking_entity/entityfields/year/valueProcess.js @@ -0,0 +1,7 @@ +import("system.vars"); +import("system.result"); +import("system.neon"); + +var year = vars.get("$field.DATE") + +result.string(year); \ No newline at end of file diff --git a/neonContext/Timetracking/Timetracking.aod b/neonContext/Timetracking/Timetracking.aod index fb59e694618d4c2e708c7683565b90a9ea562446..1cd5118750a6c5d10e0cda5a363edabdb0709682 100644 --- a/neonContext/Timetracking/Timetracking.aod +++ b/neonContext/Timetracking/Timetracking.aod @@ -31,5 +31,9 @@ <name>9dcc5766-f0ac-4c7e-8b93-0ea5b648a1ac</name> <view>TimetrackingAnalyses_view</view> </neonViewReference> + <neonViewReference> + <name>1290dad5-f796-4847-9510-05607e079f30</name> + <view>TimetrackingAnalysesDrawer_view</view> + </neonViewReference> </references> </neonContext> diff --git a/neonView/TimetrackingAnalysesDrawer_view/TimetrackingAnalysesDrawer_view.aod b/neonView/TimetrackingAnalysesDrawer_view/TimetrackingAnalysesDrawer_view.aod new file mode 100644 index 0000000000000000000000000000000000000000..54a798e53dfc64fbb47782b8b243471cef54a469 --- /dev/null +++ b/neonView/TimetrackingAnalysesDrawer_view/TimetrackingAnalysesDrawer_view.aod @@ -0,0 +1,18 @@ +<?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>TimetrackingAnalysesDrawer_view</name> + <majorModelMode>DISTRIBUTED</majorModelMode> + <layout> + <drawerLayout> + <name>layout</name> + <layoutCaption>Time</layoutCaption> + </drawerLayout> + </layout> + <children> + <neonViewReference> + <name>8b5f7d80-65fa-477c-bf74-65aae4befe96</name> + <entityField>#ENTITY</entityField> + <view>TimetrackingAnalyses_view</view> + </neonViewReference> + </children> +</neonView> diff --git a/neonView/TimetrackingAnalyses_view/TimetrackingAnalyses_view.aod b/neonView/TimetrackingAnalyses_view/TimetrackingAnalyses_view.aod index 1cba872d7b3568146efceb667a4958c105b845a9..73b0197c31dc7ad10cab5db81584d11943e72bee 100644 --- a/neonView/TimetrackingAnalyses_view/TimetrackingAnalyses_view.aod +++ b/neonView/TimetrackingAnalyses_view/TimetrackingAnalyses_view.aod @@ -3,18 +3,24 @@ <name>TimetrackingAnalyses_view</name> <majorModelMode>DISTRIBUTED</majorModelMode> <layout> - <drawerLayout> + <groupLayout> <name>layout</name> - <layoutCaption>Time</layoutCaption> - </drawerLayout> + </groupLayout> </layout> <children> <singleDataChartViewTemplate> <name>Pie</name> <chartType>PIE</chartType> - <xAxis>CONTACT_ID</xAxis> + <xAxis>YEAR</xAxis> <yAxis>MINUTES</yAxis> <entityField>#ENTITY</entityField> </singleDataChartViewTemplate> + <multiDataChartViewTemplate> + <name>MultiDataChart</name> + <chartType>BAR</chartType> + <xAxis>DATE</xAxis> + <yAxis>MINUTES</yAxis> + <entityField>#ENTITY</entityField> + </multiDataChartViewTemplate> </children> </neonView>