Skip to content
Snippets Groups Projects
Commit a04d84b6 authored by Benjamin Ulrich's avatar Benjamin Ulrich :speech_balloon:
Browse files

Merge branch 'cm_2002705_IconDueTime' into '2021.2.3'

[Projekt: xRM-ContactManagement][TicketNr.: 2002705][Aufgaben - Fälligkeit...

See merge request xrm/basic!1584
parents 011116aa 372e20bc
No related branches found
No related tags found
No related merge requests found
......@@ -5,9 +5,9 @@ import("system.datetime");
var res;
// The cast to date and than to long again is necessary to get no timezone problems.
var maturityDate = datetime.toLong(datetime.toDate(vars.get("$field.maturityDate_Day"), "dd.MM.yyyy"), "dd.MM.yyyy")
var start = datetime.toLong(datetime.toDate(vars.get("$field.startDate_Day"), "dd.MM.yyyy"), "dd.MM.yyyy")
var today = datetime.today();
var maturityDate = datetime.toLong(datetime.toDate(vars.get("$field.MATURITY_DATE"), "dd.MM.yyyy HH:mm"), "dd.MM.yyyy HH:mm")
var start = datetime.toLong(datetime.toDate(vars.get("$field.START_DATE"), "dd.MM.yyyy HH:mm"), "dd.MM.yyyy HH:mm")
var today = datetime.date();
if(maturityDate < today)
{
......
......@@ -27,7 +27,7 @@
<children>
<timelineViewTemplate>
<name>TasksTimeline</name>
<dateField>maturityDate_Day</dateField>
<dateField>MATURITY_DATE</dateField>
<titleField>SUBJECT</titleField>
<descriptionField>DESCRIPTION</descriptionField>
<subdescriptionField>allAttendeesFilter</subdescriptionField>
......@@ -73,11 +73,11 @@
</neonTableColumn>
<neonTableColumn>
<name>4315233d-5677-4b9c-aabd-019830e06ccf</name>
<entityField>startDate_Day</entityField>
<entityField>START_DATE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>154182d8-bc66-4901-a423-7d3a375d4154</name>
<entityField>maturityDate_Day</entityField>
<entityField>MATURITY_DATE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>2db57789-12bc-4d23-a7b2-850a1a776306</name>
......@@ -127,11 +127,11 @@
</neonTreeTableColumn>
<neonTreeTableColumn>
<name>542675c3-b44a-43b7-b664-12037f9929f6</name>
<entityField>startDate_Day</entityField>
<entityField>START_DATE</entityField>
</neonTreeTableColumn>
<neonTreeTableColumn>
<name>38aa316c-21ba-4ea6-9e6b-43b63fa24382</name>
<entityField>maturityDate_Day</entityField>
<entityField>MATURITY_DATE</entityField>
</neonTreeTableColumn>
<neonTreeTableColumn>
<name>8c3b89a3-93ea-4d55-ac8d-4a2525ae938e</name>
......@@ -147,18 +147,5 @@
</neonTreeTableColumn>
</columns>
</treeTableViewTemplate>
<dynamicMultiDataChartViewTemplate>
<name>DynamicMultiDataChart</name>
<chartType>COLUMN</chartType>
<yAxisLabel>Count</yAxisLabel>
<entityField>#ENTITY</entityField>
<columns>
<neonDynamicMultiDataChartColumn>
<name>aad9359c-9d5c-480e-9671-68933a08d615</name>
<entityField>COUNT</entityField>
<aggregateEntityField>COUNT_aggregate</aggregateEntityField>
</neonDynamicMultiDataChartColumn>
</columns>
</dynamicMultiDataChartViewTemplate>
</children>
</neonView>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment