Merge 25.7 to develop

Author: labkey-teamcity

WNPRC_Compliance/src/org/labkey/wnprc_compliance/view/enterTB.jsp

@@ -455,14 +455,14 @@
         (function() {
             measlesForm.clear = function() {
                 measlesForm.notes('');
-                measlesForm.date('');
+                measlesForm.date(moment());
                 measlesForm.disabled(true);
             };
             measlesForm.$element.collapse({toggle: true});
             measlesForm.disabled.subscribe(function(val) {
                 if (val) {
                     measlesForm.notes('');
-                    measlesForm.date('');
+                    measlesForm.date(moment());
                 }
                 measlesForm.$element.collapse(val ? 'hide' : 'show');
             });

WNPRC_Compliance/src/org/labkey/wnprc_compliance/view/uploadAccessReport.jsp

@@ -32,7 +32,7 @@
     _safe.module = module;
     module = undefined;
 </script>
-<script type="text/javascript" src="<%= getContextPath()%>/compliance/dropzone.js"></script>
+<script type="text/javascript" nonce="<%=getScriptNonce()%>" src="<%= getContextPath()%>/compliance/dropzone.js"></script>
 <link rel="stylesheet" href="https://rawgit.com/enyo/dropzone/master/dist/dropzone.css">
 <script type="text/javascript" nonce="<%=getScriptNonce()%>">
     module = _safe.module;

WNPRC_EHR/resources/queries/wnprc/MaxSpeciesPlusSubSpecies.sql

@@ -20,6 +20,12 @@ FROM (
              SELECT rowid, 'Cynomolgus' AS arrow_common_name, protocol_id, max_three_year, date_modified, date_expiration
              FROM arrow_protocols
              WHERE arrow_common_name = 'Macaque'
+
+             UNION ALL
+
+             SELECT rowid, 'Pigtail' AS arrow_common_name, protocol_id, max_three_year, date_modified, date_expiration
+             FROM arrow_protocols
+             WHERE arrow_common_name = 'Macaque'
          )
 
          UNION ALL

WNPRC_EHR/src/client/abstract/base/AnimalInfoPane.tsx

@@ -41,6 +41,7 @@ let constructArrayForTable = (animalInfo) => {
     if (!animalInfo["metaData"]["fields"][i].hidden) {
       let fieldMetadata = animalInfo["metaData"]["fields"][i];
       let key = getNameOfField(fieldMetadata);
+      let isDate: boolean = fieldMetadata.type === "date";
 
       let column = animalInfo["rows"][0][key];
       //cover the case where column could be an array
@@ -50,7 +51,7 @@ let constructArrayForTable = (animalInfo) => {
 
       let item = {
         label: fieldMetadata["caption"],
-        displayValue: column["displayValue"],
+        displayValue: isDate ? column["formattedValue"] : column["displayValue"],
         url: column["url"],
         value: column["value"]
       };

WNPRC_EHR/src/client/weight/query/helpers.ts

@@ -55,7 +55,7 @@ export const setupRestraintValues = (values: any[], taskId: string): Array<Restr
       Id: value.animalid.value,
       restraintType: value.restraint.value,
       taskid: taskId,
-      objectid: value.restraint.objectid,
+      objectid: value.restraint_objectid.value,
       date: value.date.value
     })
   }

WNPRC_EHR/src/org/labkey/wnprc_ehr/TriggerScriptHelper.java

@@ -2678,6 +2678,7 @@ public String verifyProtocolCounts(final String id, Integer project, final List<
     {
         final String RHESUS_SPECIES = "Rhesus";
         final String CYNOMOLGUS_SPECIES = "Cynomolgus";
+        final String PIGTAIL_SPECIES = "Pigtail";
         final String MACAQUE_SPECIES = "Macaque";
         final String ALL_SPECIES = "All Species";
         if (id == null)
@@ -2748,7 +2749,7 @@ public void exec(ResultSet rs) throws SQLException
                         AnimalRecord ar = EHRDemographicsService.get().getAnimal(container, id);
 
                         //we don't want to exit the animal count if ar.species() is cyno or rhesus and the protocol's species value is macaque.
-                        if (!ALL_SPECIES.equals(species) && !(RHESUS_SPECIES.equals(ar.getSpecies()) || CYNOMOLGUS_SPECIES.equals(ar.getSpecies()) && MACAQUE_SPECIES.equals(species)))
+                        if (!ALL_SPECIES.equals(species) && !(RHESUS_SPECIES.equals(ar.getSpecies()) || CYNOMOLGUS_SPECIES.equals(ar.getSpecies()) || PIGTAIL_SPECIES.equals(ar.getSpecies()) && MACAQUE_SPECIES.equals(species)))
                         {
                             //find species
                             if (ar.getSpecies() == null || !species.equals(ar.getSpecies()))