Modified the process of determining cage size allowed. (#897)

Author: Ohsudev

onprc_ehr/resources/scripts/onprc_ehr/utils.js

@@ -105,7 +105,7 @@ ONPRC_EHR.Utils = new function(){
                             if (!row.remark){
                                 EHR.Server.Utils.addError(scriptErrors, cageField, 'You are required to enter a remark', 'INFO');
                                 EHR.Server.Utils.addError(scriptErrors, 'Id', 'You are required to enter a remark', 'INFO');
-                                EHR.Server.Utils.addError(scriptErrors, 'remark', 'A remark is required because of the case size errors.', 'WARN');
+                                EHR.Server.Utils.addError(scriptErrors, 'remark', 'A remark is required because of the cage size errors.', 'WARN');
                             }
                         }
                     }

onprc_ehr/src/org/labkey/onprc_ehr/query/ONPRC_EHRTriggerHelper.java

@@ -912,6 +912,7 @@ public List<String> verifyCageSize(String room, String cage, List<Double> weight
         List<String> ret = new ArrayList<>();
         Double availableSqFt = cageRow.getSqFt();
         Double availableHeight = cageRow.getHeight();
+        String dividername = cageRow.getDividerName();
 
         Double requiredSqFt = 0.0;
         for (Double w : weights)
@@ -922,7 +923,11 @@ public List<String> verifyCageSize(String room, String cage, List<Double> weight
                 requiredSqFt += s;
             }
         }
+        if ("No Slide".equalsIgnoreCase(dividername))
+        {
+            availableSqFt = availableSqFt * 2;
 
+        }
         if (requiredSqFt > availableSqFt)
         {
             ret.add("These animals are too LARGE for this cage.  Has " + Math.round(availableSqFt) + " sq ft. Requires " + Math.round(requiredSqFt) + ".");