Skip to content

fix: documents do not follow display document preferences #344

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

Merged
yingbull merged 3 commits into from
Jul 3, 2025
Merged

fix: documents do not follow display document preferences #344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d7ccb08
Fixed issue with document preferences not working correctly
LiamStanziani Jul 2, 2025
cf5e567
Changed fix to constant property of display document as
LiamStanziani Jul 2, 2025
f85bdf3
Updated add document logic to fix content type not getting set if not…
LiamStanziani Jul 2, 2025
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
5 changes: 4 additions & 1 deletion src/main/java/org/oscarehr/documentManager/actions/AddEditDocument2Action.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,11 +264,14 @@ private boolean addDocument(HttpServletRequest request) {

// save local file
File file = writeLocalFile(Files.newInputStream(docFile.toPath()), fileName2);
//newDoc.setContentType(docFile.getContentType());

if (fileName2.toLowerCase().endsWith(".pdf")) {
newDoc.setContentType("application/pdf");
int numberOfPages = countNumOfPages(fileName2);
newDoc.setNumberOfPages(numberOfPages);
} else {
int dotIndex = fileName2.lastIndexOf('.');
newDoc.setContentType(fileName2.substring(dotIndex + 1));
}


Expand Down
8 changes: 3 additions & 5 deletions src/main/java/org/oscarehr/provider/web/ProviderProperty2Action.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2235,10 +2235,9 @@ public String savePatientNameLength() {
}

public String viewDisplayDocumentAs() {

LoggedInInfo loggedInInfo = LoggedInInfo.getLoggedInInfoFromSession(request);
String providerNo = loggedInInfo.getLoggedInProviderNo();
UserProperty fmt = this.userPropertyDAO.getProp(providerNo, "displayDocumentAsProperty");
UserProperty fmt = this.userPropertyDAO.getProp(providerNo, UserProperty.DISPLAY_DOCUMENT_AS);

if (fmt == null) {
fmt = new UserProperty();
Expand All @@ -2265,18 +2264,17 @@ public String viewDisplayDocumentAs() {
}

public String saveDisplayDocumentAs() {

LoggedInInfo loggedInInfo = LoggedInInfo.getLoggedInInfoFromSession(request);
String providerNo = loggedInInfo.getLoggedInProviderNo();

UserProperty prop = this.getDisplayDocumentAsProperty();
String fmt = prop != null ? prop.getValue() : "";
UserProperty saveProperty = this.userPropertyDAO.getProp(providerNo, "displayDocumentAsProperty");
UserProperty saveProperty = this.userPropertyDAO.getProp(providerNo, UserProperty.DISPLAY_DOCUMENT_AS);

if (saveProperty == null) {
saveProperty = new UserProperty();
saveProperty.setProviderNo(providerNo);
saveProperty.setName("displayDocumentAsProperty");
saveProperty.setName(UserProperty.DISPLAY_DOCUMENT_AS);
}

saveProperty.setValue(fmt);
Expand Down
Loading