Create fields to coalesce name/label for studies

Author: bbimber

Studies/resources/schemas/studies.xml

@@ -208,7 +208,7 @@
                     <fkDbSchema>studies</fkDbSchema>
                     <fkTable>studies</fkTable>
                     <fkColumnName>rowId</fkColumnName>
-                    <fkDisplayColumnName>label</fkDisplayColumnName>
+                    <fkDisplayColumnName>labelOrName</fkDisplayColumnName>
                 </fk>
             </column>
             <column columnName="cohortName">
@@ -287,7 +287,7 @@
                     <fkDbSchema>studies</fkDbSchema>
                     <fkTable>studies</fkTable>
                     <fkColumnName>rowId</fkColumnName>
-                    <fkDisplayColumnName>label</fkDisplayColumnName>
+                    <fkDisplayColumnName>labelOrName</fkDisplayColumnName>
                 </fk>
             </column>
             <column columnName="label">
@@ -352,7 +352,7 @@
                     <fkDbSchema>studies</fkDbSchema>
                     <fkTable>studies</fkTable>
                     <fkColumnName>rowId</fkColumnName>
-                    <fkDisplayColumnName>label</fkDisplayColumnName>
+                    <fkDisplayColumnName>labelOrName</fkDisplayColumnName>
                 </fk>
             </column>
             <column columnName="cohortId">
@@ -361,7 +361,7 @@
                     <fkDbSchema>studies</fkDbSchema>
                     <fkTable>studyCohorts</fkTable>
                     <fkColumnName>rowId</fkColumnName>
-                    <fkDisplayColumnName>label</fkDisplayColumnName>
+                    <fkDisplayColumnName>labelOrName</fkDisplayColumnName>
                 </fk>
             </column>
             <column columnName="label">

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

@@ -138,11 +138,11 @@ else if (TABLE_LOOKUPS.equalsIgnoreCase(name))
         }
         else if (TABLE_STUDIES.equalsIgnoreCase(name))
         {
-            return createStudiesTable(name, cf, false);
+            return createStudiesTable(name, cf);
         }
         else if (TABLE_COHORTS.equalsIgnoreCase(name))
         {
-            return createStudyDesignTable(name, cf, true);
+            return createCohortsTable(name, cf);
         }
         else if (TABLE_ANCHOR_EVENTS.equalsIgnoreCase(name))
         {
@@ -169,18 +169,41 @@ else if (TABLE_EVENT_TYPES.equalsIgnoreCase(name))
         return super.createTable(name, cf);
     }
 
-    private TableInfo createStudiesTable(String name, ContainerFilter cf, boolean addTriggers)
+    private TableInfo createCohortsTable(String name, ContainerFilter cf)
+    {
+        CustomPermissionsTable<?> ret = createStudyDesignTable(name, cf, true);
+
+        SQLFragment sql2 = new SQLFragment("coalesce(" + ExprColumn.STR_TABLE_ALIAS + ".label, " + ExprColumn.STR_TABLE_ALIAS + ".cohortName)");
+        ExprColumn col2 = new ExprColumn(ret, "labelOrName", sql2, JdbcType.VARCHAR, ret.getColumn("cohortName"), ret.getColumn("label"));
+        col2.setLabel("Cohort Name");
+        col2.setHidden(true);
+        col2.setDescription("This column lists the cohort label, and the name if label is blank");
+
+        ret.addColumn(col2);
+
+        return ret;
+    }
+
+    private TableInfo createStudiesTable(String name, ContainerFilter cf)
     {
-        CustomPermissionsTable<?> ret = createStudyDesignTable(name, cf, addTriggers);
+        CustomPermissionsTable<?> ret = createStudyDesignTable(name, cf, false);
 
         final String chr = ret.getSqlDialect().isPostgreSQL() ? "chr" : "char";
-        SQLFragment sql1 = new SQLFragment("(SELECT ").append(ret.getSqlDialect().getGroupConcat(new SQLFragment("c.label"), true, true, new SQLFragment(chr + "(10)"))).append(" as expr FROM " + StudiesSchema.NAME + "." + TABLE_COHORTS + " c WHERE c.studyId = " + ExprColumn.STR_TABLE_ALIAS + ".rowId)");
+        SQLFragment sql1 = new SQLFragment("(SELECT ").append(ret.getSqlDialect().getGroupConcat(new SQLFragment("coalesce(c.label, c.cohortName)"), true, true, new SQLFragment(chr + "(10)"))).append(" as expr FROM " + StudiesSchema.NAME + "." + TABLE_COHORTS + " c WHERE c.studyId = " + ExprColumn.STR_TABLE_ALIAS + ".rowId)");
         ExprColumn col1 = new ExprColumn(ret, "cohorts", sql1, JdbcType.VARCHAR, ret.getColumn("rowid"));
         col1.setLabel("Cohort(s)");
         col1.setDescription("This column lists the cohort labels for this study");
 
         ret.addColumn(col1);
 
+        SQLFragment sql2 = new SQLFragment("coalesce(" + ExprColumn.STR_TABLE_ALIAS + ".label, " + ExprColumn.STR_TABLE_ALIAS + ".studyName)");
+        ExprColumn col2 = new ExprColumn(ret, "labelOrName", sql2, JdbcType.VARCHAR, ret.getColumn("studyName"), ret.getColumn("label"));
+        col2.setLabel("Study Name");
+        col2.setHidden(true);
+        col2.setDescription("This column lists the study label, and the name if label is blank");
+
+        ret.addColumn(col2);
+
         return ret;
     }