From 3bec6265f9bc7a0329aa458701f4dcc52a591498 Mon Sep 17 00:00:00 2001 From: Ohsudev <76500320+Ohsudev@users.noreply.github.com> Date: Sun, 14 Jan 2024 14:44:19 -0800 Subject: [PATCH] Modified the process of determining cage size allowed. --- onprc_ehr/resources/scripts/onprc_ehr/utils.js | 2 +- .../org/labkey/onprc_ehr/query/ONPRC_EHRTriggerHelper.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/onprc_ehr/resources/scripts/onprc_ehr/utils.js b/onprc_ehr/resources/scripts/onprc_ehr/utils.js index 67eaaaced..ece0804ab 100644 --- a/onprc_ehr/resources/scripts/onprc_ehr/utils.js +++ b/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'); } } } diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/query/ONPRC_EHRTriggerHelper.java b/onprc_ehr/src/org/labkey/onprc_ehr/query/ONPRC_EHRTriggerHelper.java index 4a452a252..73911a6d7 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/query/ONPRC_EHRTriggerHelper.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/query/ONPRC_EHRTriggerHelper.java @@ -912,6 +912,7 @@ public List verifyCageSize(String room, String cage, List weight List 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 verifyCageSize(String room, String cage, List 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) + ".");