Skip to content

Fixed some bugs in develop/dogfish #490

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
Aug 29, 2025
Merged

Fixed some bugs in develop/dogfish #490

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
32d3f75
fix: fixed EChart -> Disease Registry's 404 error and css style; adde…
kateyang1998 Aug 29, 2025
7ea4402
fix: fixed tickler note saving issue
kateyang1998 Aug 29, 2025
812e096
Merge branch 'develop/dogfish' into issue-477-dogfish-bug-fix
kateyang1998 Aug 29, 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
15 changes: 11 additions & 4 deletions src/main/java/ca/openosp/openo/casemgmt/web/CaseManagementEntry2Action.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3292,10 +3292,17 @@ public static boolean determineNoteRole(CaseManagementNote note, String provider
boolean programSet = false;

if (note.getProgram_no() != null && note.getProgram_no().length() > 0 && !"null".equals(note.getProgram_no())) {
ProgramProvider pp = programProviderDao.getProgramProvider(note.getProviderNo(), Long.valueOf(note.getProgram_no()));
if (pp != null) {
note.setReporter_caisi_role(String.valueOf(pp.getRoleId()));
programSet = true;
try {
Long programId = Long.valueOf(note.getProgram_no());
if (programId > 0) {
ProgramProvider pp = programProviderDao.getProgramProvider(note.getProviderNo(), programId);
if (pp != null) {
note.setReporter_caisi_role(String.valueOf(pp.getRoleId()));
programSet = true;
}
}
} catch (NumberFormatException e) {
// Invalid program number format, skip program provider lookup
}
}

Expand Down
6 changes: 6 additions & 0 deletions src/main/webapp/WEB-INF/classes/struts.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1462,6 +1462,9 @@
<action name="oscarResearch/oscarDxResearch/setupDxResearch" class="ca.openosp.openo.dxresearch.pageUtil.dxSetupResearch2Action">
<result name="success">/oscarResearch/oscarDxResearch/dxResearch.jsp</result>
</action>
<action name="oscarResearch/dxresearch/setupDxResearch" class="ca.openosp.openo.dxresearch.pageUtil.dxSetupResearch2Action">
<result name="success">/oscarResearch/oscarDxResearch/dxResearch.jsp</result>
</action>
<action name="oscarResearch/oscarDxResearch/dxResearch" class="ca.openosp.openo.dxresearch.pageUtil.dxResearch2Action">
<result name="codeSearch">/oscarResearch/oscarDxResearch/dxcodeSearch.do</result>
<result name="success">/oscarResearch/oscarDxResearch/setupDxResearch.do</result>
Expand All @@ -1473,6 +1476,9 @@
<action name="oscarResearch/oscarDxResearch/dxResearchUpdate" class="ca.openosp.openo.dxresearch.pageUtil.dxResearchUpdate2Action">
<result name="success">/oscarResearch/oscarDxResearch/setupDxResearch.do</result>
</action>
<action name="oscarResearch/dxresearch/dxResearchUpdate" class="ca.openosp.openo.dxresearch.pageUtil.dxResearchUpdate2Action">
<result name="success">/oscarResearch/oscarDxResearch/setupDxResearch.do</result>
</action>
<action name="oscarResearch/oscarDxResearch/dxResearchLoadQuickList" class="ca.openosp.openo.dxresearch.pageUtil.dxResearchLoadQuickList2Action">
<result name="success">/oscarResearch/oscarDxResearch/dxResearchSelectQuickList.jsp</result>
</action>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/oscarResearch/oscarDxResearch/dxResearch.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
href="${pageContext.servletContext.contextPath}/library/bootstrap/3.0.0/css/bootstrap.min.css"/>
<link rel="stylesheet" type="text/css" media="all"
href="${pageContext.servletContext.contextPath}/library/bootstrap/3.0.0/css/bootstrap-theme.min.css"/>
<link rel="stylesheet" type="text/css" href="dxResearch.css">
<link rel="stylesheet" type="text/css" href="${pageContext.servletContext.contextPath}/oscarResearch/oscarDxResearch/dxResearch.css">

<script type="text/javascript">
//<!--
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/oscarResearch/oscarDxResearch/dxResearchCustomization.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<title><fmt:setBundle basename="oscarResources"/><fmt:message key="oscarResearch.oscarDxResearch.dxCustomization.title"/></title>
<script type="text/javascript" src="${pageContext.servletContext.contextPath}/js/global.js"></script>
<base href="<%= request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + request.getContextPath() + "/" %>">
<link rel="stylesheet" type="text/css" href="dxResearch.css"/>
<link rel="stylesheet" type="text/css" href="${pageContext.servletContext.contextPath}/oscarResearch/oscarDxResearch/dxResearch.css"/>

</head>

Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/oscarResearch/oscarDxResearch/dxResearchEditQuickList.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
int Count = 0;
%>

<link rel="stylesheet" type="text/css" href="dxResearch.css">
<link rel="stylesheet" type="text/css" href="${pageContext.servletContext.contextPath}/oscarResearch/oscarDxResearch/dxResearch.css">
<html>
<head>
<script type="text/javascript" src="<%= request.getContextPath() %>/js/global.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/oscarResearch/oscarDxResearch/dxResearchNewQuickList.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>


<link rel="stylesheet" type="text/css" href="dxResearch.css">
<link rel="stylesheet" type="text/css" href="${pageContext.servletContext.contextPath}/oscarResearch/oscarDxResearch/dxResearch.css">
<html>
<head>
<script type="text/javascript" src="<%= request.getContextPath() %>/js/global.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/oscarResearch/oscarDxResearch/dxResearchSelectAssociations.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<html>
<head>
<link rel="stylesheet" type="text/css" href="dxResearch.css">
<link rel="stylesheet" type="text/css" href="${pageContext.servletContext.contextPath}/oscarResearch/oscarDxResearch/dxResearch.css">
<script type="text/javascript" src="<%= request.getContextPath() %>/js/global.js"></script>
<link rel="stylesheet" type="text/css" href="<%= request.getContextPath() %>/js/jquery_css/smoothness/jquery-ui-1.10.2.custom.min.css"/>
<script type="text/javascript" src="<%= request.getContextPath() %>/js/jquery-1.9.1.js"></script>
Expand Down Expand Up @@ -99,7 +99,7 @@
</script>

</head>
<link rel="stylesheet" type="text/css" href="dxResearch.css">
<link rel="stylesheet" type="text/css" href="${pageContext.servletContext.contextPath}/oscarResearch/oscarDxResearch/dxResearch.css">
<body class="BodyStyle" vlink="#0000FF" rightmargin="0" leftmargin="0"
topmargin="0" marginwidth="0" marginheight="0" onload="setfocus()" bgcolor="#EEEEFF">
<!-- -->
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/oscarResearch/oscarDxResearch/dxResearchSelectQuickList.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>

<link rel="stylesheet" type="text/css" href="dxResearch.css">
<link rel="stylesheet" type="text/css" href="${pageContext.servletContext.contextPath}/oscarResearch/oscarDxResearch/dxResearch.css">
<html>
<head>
<script type="text/javascript" src="<%= request.getContextPath() %>/js/global.js"></script>
Expand Down
Loading