Skip to content

Fixed missing image on print card page #749

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 4 commits into from
Oct 20, 2025
Merged

Fixed missing image on print card page #749

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1a56a6a
Fixed 404 image on print card page by setting default image to openos…
LiamStanziani Oct 17, 2025
c1f6e2f
Update src/main/java/ca/openosp/openo/ui/servlet/ImageRenderingServle…
LiamStanziani Oct 18, 2025
0686f9b
Updated default clinic logo solution to use a more portable solution …
LiamStanziani Oct 20, 2025
417b6f4
Quick comment update to improve readability
LiamStanziani Oct 20, 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
14 changes: 12 additions & 2 deletions src/main/java/ca/openosp/openo/ui/servlet/ImageRenderingServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import javax.servlet.http.HttpSession;
import java.io.*;
import java.net.SocketException;
import java.net.URL;

/**
* This servlet requires a parameter called "source" which should signify where to get the image from. Examples include source=local_client, or source=hnr_client. Depending on the source, you may optionally need more parameters, as examples a local_client
Expand Down Expand Up @@ -315,7 +316,6 @@ private static void renderSignatureStored(HttpServletRequest request, HttpServle
}

private static void renderClinicLogoStored(HttpServletRequest request, HttpServletResponse response) throws IOException {

// sec check
HttpSession session = request.getSession();
Provider provider = (Provider) session.getAttribute(SessionConstants.LOGGED_IN_PROVIDER);
Expand All @@ -324,8 +324,18 @@ private static void renderClinicLogoStored(HttpServletRequest request, HttpServl
return;
}

// Get the default logo from the web resources
URL defaultResourceUrl = session.getServletContext()
.getResource("/WEB-INF/classes/loginResource/openosp_logo.png");
String defaultClinicLogo = (defaultResourceUrl != null) ? defaultResourceUrl.getPath() : null;

try {
String filename = OscarProperties.getInstance().getProperty("CLINIC_LOGO_FILE");
// Set the filename from properties or use the default logo
String filename = OscarProperties.getInstance().getProperty("CLINIC_LOGO_FILE", defaultClinicLogo);
if (filename == null || filename.isEmpty()) {
filename = defaultClinicLogo;
}

if (filename != null) {
File f = new File(filename);
Comment thread
sourcery-ai[bot] marked this conversation as resolved.
Comment thread
sourcery-ai[bot] marked this conversation as resolved.
if (f != null && f.exists()) {
Expand Down
Loading