#184 comparation offset: support for non time fields

metasfresh · Mar 3, 2017 · a62e320 · a62e320
1 parent 40cdb23
commit a62e320
Showing 1 changed file with 16 additions and 15 deletions.
diff --git a/metasfresh-webui-api/src/main/java/de/metas/ui/web/dashboard/KPIDataLoader.java b/metasfresh-webui-api/src/main/java/de/metas/ui/web/dashboard/KPIDataLoader.java
@@ -112,31 +112,32 @@ public KPIDataLoader setTimeRange(long fromMillis, long toMillis)
 		{
 			timeRanges.add(TimeRange.offset(mainTimeRange, compareOffset));
 
+			fieldNameExtractor = (field, timeRange) -> {
+				if (timeRange.isMainTimeRange())
+				{
+					return field.getFieldName();
+				}
+				else if (field.isGroupBy())
+				{
+					return "_" + field.getOffsetFieldName();
+				}
+				else
+				{
+					return field.getOffsetFieldName();
+				}
+			};
+
 			final KPIField groupByField = kpi.getGroupByField();
 			if (groupByField.getValueType().isDate())
 			{
-				fieldNameExtractor = (field, timeRange) -> {
-					if (timeRange.isMainTimeRange())
-					{
-						return field.getFieldName();
-					}
-					else if (field.isGroupBy())
-					{
-						return "_" + field.getOffsetFieldName();
-					}
-					else
-					{
-						return field.getOffsetFieldName();
-					}
-				};
 				dataSetValueKeyExtractor = (bucket, timeRange) -> {
 					final long millis = convertToMillis(bucket.getKey());
 					return JSONDate.toJson(timeRange.subtractOffset(millis));
 				};
 			}
 			else
 			{
-				throw new AdempiereException("Only fields of type Date are supported for groupping by with offset");
+				dataSetValueKeyExtractor = (bucket, timeRange) -> groupByField.convertValueToJson(bucket.getKey());
 			}
 		}