Improve MCC data notification

Author: bbimber

mcc/resources/queries/study/demographics/With Parent Gender.qview.xml

@@ -0,0 +1,32 @@
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" hidden="true">
+    <columns>
+        <column name="colony"/>
+        <column name="Id"/>
+        <column name="gender"/>
+        <column name="Id/age/yearAndDays"/>
+        <column name="calculated_status">
+            <properties>
+                <property name="columnTitle" value="Status"/>
+            </properties>
+        </column>
+        <column name="u24_status"/>
+        <column name="birth"/>
+        <column name="dam"/>
+        <column name="dam/demographics/gender">
+            <properties>
+                <property name="columnTitle" value="Dam Sex"/>
+            </properties>
+        </column>
+        <column name="sire"/>
+        <column name="sire/demographics/gender">
+            <properties>
+                <property name="columnTitle" value="Sire Sex"/>
+            </properties>
+        </column>
+        <column name="litterId"/>
+        <column name="history" />
+    </columns>
+    <sorts>
+        <sort column="Id" descending="false"/>
+    </sorts>
+</customView>

mcc/src/org/labkey/mcc/notification/MCCDataNotification.java

@@ -138,23 +138,23 @@ protected void doParentSexCheck(final Container c, User u, final StringBuilder m
     {
         TableInfo demographics = getStudySchema(c, u).getTable("demographics");
 
-        SimpleFilter filter = new SimpleFilter(FieldKey.fromString("dam/Demographics/gender/origgender"), "female", CompareType.NEQ_OR_NULL);
+        SimpleFilter filter = new SimpleFilter(FieldKey.fromString("dam/Demographics/gender/origgender"), "f", CompareType.NEQ_OR_NULL);
         TableSelector ts = new TableSelector(demographics, filter, null);
         long count = ts.getRowCount();
         if (count > 0)
         {
-            msg.append("<b>WARNING: There are ").append(count).append(" dams with gender not equal to female</b><br>\n");
-            msg.append("<p><a href='").append(getExecuteQueryUrl(c, "study", "demographics", null)).append("&").append(filter.toQueryString("query")).append("'>Click here to view them</a><br>\n\n");
+            msg.append("<b>WARNING: There are ").append(count).append(" dams with gender not equal to f</b><br>\n");
+            msg.append("<p><a href='").append(getExecuteQueryUrl(c, "study", "demographics", null)).append("&query.viewName=With Parent Gender&").append(filter.toQueryString("query")).append("'>Click here to view them</a><br>\n\n");
             msg.append("<hr>\n\n");
         }
 
-        filter = new SimpleFilter(FieldKey.fromString("sire/Demographics/gender/origgender"), "male", CompareType.NEQ_OR_NULL);
+        filter = new SimpleFilter(FieldKey.fromString("sire/Demographics/gender/origgender"), "m", CompareType.NEQ_OR_NULL);
         ts = new TableSelector(demographics, filter, null);
         count = ts.getRowCount();
         if (count > 0)
         {
-            msg.append("<b>WARNING: There are ").append(count).append(" sires with gender not equal to male</b><br>\n");
-            msg.append("<p><a href='").append(getExecuteQueryUrl(c, "study", "demographics", null)).append("&").append(filter.toQueryString("query")).append("'>Click here to view them</a><br>\n\n");
+            msg.append("<b>WARNING: There are ").append(count).append(" sires with gender not equal to m</b><br>\n");
+            msg.append("<p><a href='").append(getExecuteQueryUrl(c, "study", "demographics", null)).append("&query.viewName=With Parent Gender&").append(filter.toQueryString("query")).append("'>Click here to view them</a><br>\n\n");
             msg.append("<hr>\n\n");
         }
     }