Expand MCC weight precision

Author: bbimber

mcc/resources/queries/study/demographicsMostRecentWeight.query.xml

@@ -13,7 +13,7 @@
                             query.queryName=Weight&
                             query.id~eq=${id}
                         </url>
-                        <formatString>0.##</formatString>
+                        <formatString>0.####</formatString>
                     </column>
                     <column columnName="MostRecentWeightGrams">
                         <columnTitle>Current Weight (g)</columnTitle>

mcc/resources/queries/study/demographicsMostRecentWeight.sql

@@ -12,7 +12,7 @@ timestampdiff('SQL_TSI_DAY', w.MostRecentWeightDate, now()) AS DaysSinceWeight,
 null as weightField,
 --NOTE: we need to be careful in case duplicate weights are entered on the same time
 cast((
-    SELECT round(cast(AVG(w2.weight) as double), 2) AS _expr
+    SELECT round(cast(AVG(w2.weight) as double), 4) AS _expr
     FROM study.weight w2
     WHERE w.id=w2.id AND w.MostRecentWeightDate=w2.date
 ) as double) AS MostRecentWeight,

mcc/resources/queries/study/weight.query.xml

@@ -38,8 +38,8 @@
                         </fk>
                     </column>
                     <column columnName="weight">
-                      <columnTitle>Weight (kg)</columnTitle>
-                        <formatString>0.###</formatString>
+                        <columnTitle>Weight (kg)</columnTitle>
+                        <formatString>0.####</formatString>
                     </column>
                 </columns>
             </table>

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

@@ -14,8 +14,6 @@
 import org.labkey.mcc.MccManager;
 
 import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * User: bimber
@@ -81,6 +79,7 @@ public String getMessageBodyHTML(Container c, User u)
         doU24AssignedCheck(mccData, u , msg);
         doMissingIdCheck(mccData, u, msg);
         doZeroWeightCheck(mccData, u, msg);
+        doDuplicationCheck(mccData, u, msg);
 
         //since we dont want to trigger an email if there's no alerts, conditionally append the title
         if (msg.length() > 0)
@@ -174,4 +173,37 @@ protected void doParentSexCheck(final Container c, User u, final StringBuilder m
             msg.append("<hr>\n\n");
         }
     }
+
+    protected void doDuplicationCheck(final Container c, User u, final StringBuilder msg)
+    {
+        TableInfo ti = getUserSchemaByName(c, u, "mcc").getTable("duplicateDemographics");
+        TableSelector ts = new TableSelector(ti);
+        long count = ts.getRowCount();
+        if (count > 0)
+        {
+            msg.append("<b>WARNING: There are ").append(count).append(" demographics records with duplicated MCC IDs\n");
+            msg.append("<p><a href='").append(getExecuteQueryUrl(c, "mcc", "duplicateDemographics", null)).append("'>Click here to view them</a><br>\n\n");
+            msg.append("<hr>\n\n");
+        }
+
+        ti = getUserSchemaByName(c, u, "mcc").getTable("duplicatedAggregatedDemographics");
+        ts = new TableSelector(ti);
+        count = ts.getRowCount();
+        if (count > 0)
+        {
+            msg.append("<b>WARNING: There are ").append(count).append(" aggregated demographics records with duplicated MCC IDs\n");
+            msg.append("<p><a href='").append(getExecuteQueryUrl(c, "mcc", "duplicatedAggregatedDemographics", null)).append("'>Click here to view them</a><br>\n\n");
+            msg.append("<hr>\n\n");
+        }
+
+        ti = getUserSchemaByName(c, u, "mcc").getTable("duplicatedAggregatedDemographicsParents");
+        ts = new TableSelector(ti);
+        count = ts.getRowCount();
+        if (count > 0)
+        {
+            msg.append("<b>WARNING: There are ").append(count).append(" aggregated demographics parent records with duplicated MCC IDs\n");
+            msg.append("<p><a href='").append(getExecuteQueryUrl(c, "mcc", "duplicatedAggregatedDemographicsParents", null)).append("'>Click here to view them</a><br>\n\n");
+            msg.append("<hr>\n\n");
+        }
+    }
 }