Add ResultsOOODisplayColumn

Author: bbimber

Studies/resources/referenceStudy/study/datasets/datasets_metadata.xml

@@ -173,6 +173,10 @@
             </column>
             <column columnName="resultOORIndicator">
                 <datatype>varchar</datatype>
+                <isHidden>true</isHidden>
+                <displayColumnFactory>
+                    <className>org.labkey.studies.query.ResultsOOODisplayColumn</className>
+                </displayColumnFactory>
             </column>
             <column columnName="units">
                 <datatype>varchar</datatype>
@@ -288,6 +292,9 @@
             <column columnName="subgroup">
                 <datatype>varchar</datatype>
             </column>
+            <column columnName="cohortId">
+                <columnTitle>Cohort ID</columnTitle>
+            </column>
             <column columnName="description">
                 <datatype>varchar</datatype>
             </column>

Studies/src/org/labkey/studies/query/ResultsOOODisplayColumn.java

@@ -0,0 +1,68 @@
+package org.labkey.studies.query;
+
+import org.apache.commons.lang3.StringUtils;
+import org.labkey.api.data.ColumnInfo;
+import org.labkey.api.data.DataColumn;
+import org.labkey.api.data.RenderContext;
+import org.labkey.api.query.FieldKey;
+
+import java.text.DecimalFormat;
+import java.util.Set;
+
+public class ResultsOOODisplayColumn extends DataColumn
+{
+    public ResultsOOODisplayColumn(ColumnInfo col)
+    {
+        super(col);
+    }
+
+    @Override
+    public Class getDisplayValueClass()
+    {
+        return String.class;
+    }
+
+    @Override
+    public Object getDisplayValue(RenderContext ctx)
+    {
+        Object result = ctx.get(getBoundColumn().getFieldKey(), Double.class);
+        if (result == null)
+        {
+            return null;
+        }
+
+        String oor = ctx.get(getOOR(), String.class);
+        if (StringUtils.isEmpty(oor))
+        {
+            return result;
+        }
+
+        if (getBoundColumn().getFormat() != null)
+        {
+            DecimalFormat fmt = new DecimalFormat(getBoundColumn().getFormat());
+            result = fmt.format(result);
+        }
+
+        return oor + result;
+    }
+
+    private FieldKey getOOR()
+    {
+        FieldKey oor = FieldKey.fromString("resultOOOIndicator");
+        if (getBoundColumn() != null)
+        {
+            return FieldKey.fromParts(getBoundColumn().getFieldKey().getParent(), oor);
+        }
+        else
+        {
+            return oor;
+        }
+    }
+
+    @Override
+    public void addQueryFieldKeys(Set<FieldKey> keys)
+    {
+        super.addQueryFieldKeys(keys);
+        keys.add(getOOR());
+    }
+}