Skip to content

BAH-4739 | Add new dose units enum constants and fix extension path derivation logic #32

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

Open
sasikiran-tw wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −4
Open

BAH-4739 | Add new dose units enum constants and fix extension path derivation logic #32

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
4 changes: 3 additions & 1 deletion api/src/main/java/org/openmrs/module/rulesengine/domain/Dose.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ public DoseUnit getDoseUnit() {
}

public enum DoseUnit {
mg
mg,
mcg,
ml
}

public String getDrugName() {
Expand Down
5 changes: 2 additions & 3 deletions api/src/main/java/org/openmrs/module/rulesengine/engine/RulesEngineImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ private List<DosageRule> getExtendedRules() {
}

private File[] getExtendedRuleFiles() {
File folder = new File(getRulesEngineExtensionPath());
File folder = new File(OpenmrsUtil.getApplicationDataDirectory(), getRulesEngineExtensionPath());
File[] listOfFiles = folder.listFiles(new FilenameFilter() {
public boolean accept(File dir, String filename) {
return filename.endsWith(".groovy");
Expand All @@ -96,8 +96,7 @@ public boolean accept(File dir, String filename) {
}

private String getRulesEngineExtensionPath() {
String ruleFilePath = OpenmrsUtil.getApplicationDataDirectory() +
"bahmni_config" + File.separator + "openmrs" + File.separator +
String ruleFilePath = "bahmni_config" + File.separator + "openmrs" + File.separator +
rulesEngineExtensionPath;
return ruleFilePath;
}
Expand Down