From 270a44b45b88bf1ba60d60e90938475d1265f12e Mon Sep 17 00:00:00 2001
From: Pascal Brandt <psbrandt@gmail.com>
Date: Tue, 1 Dec 2015 13:34:27 +0200
Subject: [PATCH] Add support for columns without data types.

---
 .../reportingrest/web/resource/DataSetMetaDataConverter.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/omod/src/main/java/org/openmrs/module/reportingrest/web/resource/DataSetMetaDataConverter.java b/omod/src/main/java/org/openmrs/module/reportingrest/web/resource/DataSetMetaDataConverter.java
index 0a6e3c8..8dc224d 100644
--- a/omod/src/main/java/org/openmrs/module/reportingrest/web/resource/DataSetMetaDataConverter.java
+++ b/omod/src/main/java/org/openmrs/module/reportingrest/web/resource/DataSetMetaDataConverter.java
@@ -37,7 +37,7 @@ public SimpleObject asRepresentation(DataSetMetaData metadata, Representation re
 			Map<String, String> columnMap = new HashMap<String, String>();
 			columnMap.put("name", column.getName());
 			columnMap.put("label", column.getLabel());
-			columnMap.put("datatype", column.getDataType().getName());
+			columnMap.put("datatype", column.getDataType() == null ? "null" : column.getDataType().getName());
 			columns.add(columnMap);
 		}