Back out change to WrappedColumn in favor of ExprColumn

Author: bbimber

LDK/test/src/org/labkey/test/tests/external/labModules/LabModulesTest.java

@@ -1415,6 +1415,7 @@ private void samplesTableTest() throws Exception
             columnLabels.add(getColumnLabel(srr, name));
         }
 
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
         List<List<String>> rows = new ArrayList<>();
         for (Map<String, Object> row : srr.getRows())
         {
@@ -1425,7 +1426,7 @@ private void samplesTableTest() throws Exception
                 String val = row.get(name) == null ? "" : String.valueOf(row.get(name));
                 if (name.toLowerCase().contains("date"))
                 {
-                    val = StringUtils.isEmpty(val) ? "" : ExcelHelper.getDateTimeFormat().format(new Date(val));
+                    val = StringUtils.isEmpty(val) ? "" : dateFormat.format(val);
                 }
 
                 target.add(val);

laboratory/src/org/labkey/laboratory/query/LaboratoryTableCustomizer.java

@@ -184,7 +184,7 @@ public void customizeColumns(AbstractTableInfo  ti)
             {
                 container.setHidden(true);
 
-                BaseColumnInfo wrappedContainer = WrappedColumnInfo.wrapAsCopy(ti, FieldKey.fromString("workbook"), container, "Workbook", null);
+                ExprColumn wrappedContainer = new ExprColumn(ti, FieldKey.fromString("workbook"), container.getValueSql(ExprColumn.STR_TABLE_ALIAS), JdbcType.GUID, container);
                 wrappedContainer.setName("workbook");
                 wrappedContainer.setCalculated(true);
                 wrappedContainer.setShownInInsertView(false);