Values, JSONDate - add more converters

#664
metasfresh · Nov 13, 2017 · b7d3e4d · b7d3e4d
1 parent 0958391
commit b7d3e4d
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 10 deletions.
diff --git a/src/main/java/de/metas/ui/web/window/datatypes/Values.java b/src/main/java/de/metas/ui/web/window/datatypes/Values.java
@@ -12,6 +12,7 @@
 import de.metas.ui.web.window.datatypes.json.JSONLookupValue;
 import de.metas.ui.web.window.datatypes.json.JSONLookupValuesList;
 import de.metas.ui.web.window.datatypes.json.JSONRange;
+import lombok.experimental.UtilityClass;
 
 /*
  * #%L
@@ -41,6 +42,7 @@
  * @author metas-dev <dev@metasfresh.com>
  *
  */
+@UtilityClass
 public final class Values
 {
 	public static final Object valueToJsonObject(final Object value)
@@ -66,7 +68,7 @@ else if (value instanceof java.util.Date)
 			final java.util.Date valueDate = (java.util.Date)value;
 			return JSONDate.toJson(valueDate);
 		}
-		else if(value instanceof DateRangeValue)
+		else if (value instanceof DateRangeValue)
 		{
 			final DateRangeValue dateRange = (DateRangeValue)value;
 			return JSONRange.of(dateRange);
@@ -109,8 +111,33 @@ else if (value instanceof Collection)
 		}
 	}
 
-	private Values()
+	public static BigDecimal toBigDecimal(final Object value)
 	{
-		throw new UnsupportedOperationException();
+		if (value == null)
+		{
+			return null;
+		}
+		else if (value instanceof BigDecimal)
+		{
+			return (BigDecimal)value;
+		}
+		else
+		{
+			final String valueStr = value.toString().trim();
+			if (valueStr.isEmpty())
+			{
+				return null;
+			}
+			return new BigDecimal(valueStr);
+		}
+	}
+
+	public static int toInt(final Object value, final int defaultValueIfNull)
+	{
+		if (value == null)
+		{
+			return defaultValueIfNull;
+		}
+		return Integer.parseInt(value.toString());
 	}
 }
diff --git a/src/main/java/de/metas/ui/web/window/datatypes/json/JSONDate.java b/src/main/java/de/metas/ui/web/window/datatypes/json/JSONDate.java
@@ -73,6 +73,16 @@ public static java.util.Date fromJson(final String valueStr, final DocumentField
 			return fromDateTimeString(valueStr);
 		}
 	}
+
+	public static java.util.Date fromObject(final Object value, final DocumentFieldWidgetType widgetType)
+	{
+		if (value == null)
+		{
+			return null;
+		}
+		final String valueStr = value.toString().trim();
+		return JSONDate.fromJson(valueStr, DocumentFieldWidgetType.DateTime);
+	}
 
 	public static java.util.Date fromTimestamp(final Timestamp ts)
 	{

diff --git a/src/main/java/de/metas/ui/web/window/datatypes/json/JSONDocumentChangedEvent.java b/src/main/java/de/metas/ui/web/window/datatypes/json/JSONDocumentChangedEvent.java
@@ -1,5 +1,6 @@
 package de.metas.ui.web.window.datatypes.json;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 import org.adempiere.exceptions.AdempiereException;
@@ -12,6 +13,8 @@
 import com.google.common.collect.ImmutableList;
 
 import de.metas.ui.web.window.datatypes.DocumentIdsSelection;
+import de.metas.ui.web.window.datatypes.Values;
+import de.metas.ui.web.window.descriptor.DocumentFieldWidgetType;
 import io.swagger.annotations.ApiModel;
 import lombok.Value;
 
@@ -39,9 +42,9 @@
 
 /**
  * Document changed event.
- * 
+ *
  * Event sent by frontend when the user wants to change some fields.
- * 
+ *
  * @author metas-dev <dev@metasfresh.com>
  *
  */
@@ -91,11 +94,7 @@ public Boolean getValueAsBoolean(final Boolean defaultValue)
 
 	public int getValueAsInteger(final int defaultValueIfNull)
 	{
-		if (value == null)
-		{
-			return defaultValueIfNull;
-		}
-		return Integer.parseInt(value.toString());
+		return Values.toInt(value, defaultValueIfNull);
 	}
 
 	public List<Integer> getValueAsIntegersList()
@@ -121,4 +120,14 @@ else if (value instanceof String)
 		}
 	}
 
+	public BigDecimal getValueAsBigDecimal()
+	{
+		return Values.toBigDecimal(value);
+	}
+
+	public java.util.Date getValueAsDateTime()
+	{
+		return JSONDate.fromObject(value, DocumentFieldWidgetType.DateTime);
+	}
+
 }