Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modified the process of determining cage size allowed. #897

Merged
merged 1 commit into from
Jan 17, 2024
Merged

Modified the process of determining cage size allowed. #897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion onprc_ehr/resources/scripts/onprc_ehr/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
}
}
Expand Down
5 changes: 5 additions & 0 deletions onprc_ehr/src/org/labkey/onprc_ehr/query/ONPRC_EHRTriggerHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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) + ".");
Expand Down