Add MCC column showing numAnimalsRequested

Author: bbimber

mcc/resources/queries/mcc/requestScores/.qview.xml

@@ -7,6 +7,7 @@
         <column name="requestId/institutionname"/>
         <column name="requestId/fundingsource"/>
         <column name="requestId/grantnumber"/>
+        <column name="numAnimalsRequested"/>
         <column name="requestId/status"/>
         <column name="preliminaryScore"/>
         <column name="resourceAvailabilityAssessment"/>

mcc/src/org/labkey/mcc/MccSchema.java

@@ -32,6 +32,7 @@ public class MccSchema
     public static final String TABLE_REQUEST_REVIEWS = "requestReviews";
     public static final String TABLE_REQUEST_SCORE = "requestScores";
     public static final String TABLE_CENSUS = "census";
+    public static final String TABLE_REQUEST_COHORTS = "requestcohorts";
 
     public static MccSchema getInstance()
     {

mcc/src/org/labkey/mcc/query/MccRequestCustomizer.java

@@ -63,6 +63,14 @@ public boolean isSortable()
             ti.addColumn(newCol2);
         }
 
+        if (ti.getColumn("numAnimalsRequested") == null)
+        {
+            SQLFragment sql = new SQLFragment("(SELECT SUM(rc.numberofanimals) as expr FROM " + MccSchema.TABLE_REQUEST_COHORTS + " rc WHERE rc.requestId = " + ExprColumn.STR_TABLE_ALIAS + ".requestId)");
+            ExprColumn newCol = new ExprColumn(ti, "numAnimalsRequested", sql, JdbcType.INTEGER, ti.getColumn("requestId"));
+            newCol.setLabel("# Animals Requested");
+            ti.addColumn(newCol);
+        }
+
         if (ti.getColumn("transferIds") == null)
         {
             Container dataContainer = MccManager.get().getMCCContainer(ti.getContainer());