Minor cleanup

Author: bbimber

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

@@ -31,18 +31,18 @@ public Object getDisplayValue(RenderContext ctx)
             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);
         }
 
+        String oor = ctx.get(getOOR(), String.class);
+        if (StringUtils.isEmpty(oor))
+        {
+            return result;
+        }
+
         return oor + result;
     }
 

singlecell/resources/queries/singlecell/samples.js

@@ -23,6 +23,15 @@ function beforeUpsert(row, oldRow, errors){
     else if (['No stim', 'No Stim'].indexOf(row.stim) !== -1){
         row.stim = 'NoStim';
     }
+    else if (['Infected cells: SIV+', 'Infected Cells: SIV+'].indexOf(row.stim) !== -1){
+        row.stim = 'SIV-Infected CD4s';
+    }
+    else if (['Infected cells: SIV-', 'Infected Cells: SIV-'].indexOf(row.stim) !== -1){
+        row.stim = 'SIV-Infected CD4s / SIV-';
+    }
+    else if (['Infected cells: Mock', 'Infected Cells: Mock'].indexOf(row.stim) !== -1){
+        row.stim = 'Mock-Infected CD4s';
+    }
 
     var lookupFields = ['stim'];
     for (var i=0;i<lookupFields.length;i++){