Add columns for DPI

Author: bbimber

…udies/query/ResultsOOODisplayColumn.java …udies/query/ResultsOORDisplayColumn.javaStudies/src/org/labkey/studies/query/ResultsOOODisplayColumn.java renamed to Studies/api-src/org/labkey/api/studies/query/ResultsOORDisplayColumn.java Studies/src/org/labkey/studies/query/ResultsOOODisplayColumn.java renamed to Studies/api-src/org/labkey/api/studies/query/ResultsOORDisplayColumn.java

@@ -1,4 +1,4 @@
-package org.labkey.studies.query;
+package org.labkey.api.studies.query;
 
 import org.apache.commons.lang3.StringUtils;
 import org.labkey.api.data.ColumnInfo;
@@ -9,9 +9,9 @@
 import java.text.DecimalFormat;
 import java.util.Set;
 
-public class ResultsOOODisplayColumn extends DataColumn
+public class ResultsOORDisplayColumn extends DataColumn
 {
-    public ResultsOOODisplayColumn(ColumnInfo col)
+    public ResultsOORDisplayColumn(ColumnInfo col)
     {
         super(col);
     }
@@ -48,15 +48,15 @@ public Object getDisplayValue(RenderContext ctx)
 
     private FieldKey getOOR()
     {
-        FieldKey oor = FieldKey.fromString("resultOOOIndicator");
-        if (getBoundColumn() != null)
+        ColumnInfo col = getBoundColumn();
+        if (col == null)
         {
-            return FieldKey.fromParts(getBoundColumn().getFieldKey().getParent(), oor);
-        }
-        else
-        {
-            return oor;
+            return null;
         }
+
+        FieldKey oor = FieldKey.fromString(col.getFieldKey().getName() + "OORIndicator");
+
+        return getBoundColumn().getFieldKey().getParent() == null ? oor : FieldKey.fromParts(getBoundColumn().getFieldKey().getParent(), oor);
     }
 
     @Override