259 medical history returning 500 error

src/main/java/org/oscarehr/casemgmt/web/CaseManagementEntry2Action.java

@@ -110,6 +110,17 @@ public String execute() throws Exception {
             return null;
         }
         String method = request.getParameter("method");
+        // Check for alternate parameter names used by Struts 2
+        if (method == null) {
+            method = request.getParameter("action");
+        }
+        if (method == null) {
+            method = request.getParameter("dispatch");
+        }
+        if (method == null) {
+            method = request.getParameter("parameterValue");
+        }
+
         if ("setUpMainEncounter".equals(method)) {
             return setUpMainEncounter();
         } else if ("isNoteEdited".equals(method)) {
@@ -935,14 +946,23 @@ public String issueNoteSave() throws Exception {
         Set<CaseManagementIssue> issueSet = new HashSet<CaseManagementIssue>();
         Set<CaseManagementNote> noteSet = new HashSet<CaseManagementNote>();
         String[] issue_id = request.getParameterValues("issue_id");
-        CheckBoxBean[] existingCaseIssueList = sessionFrm.getIssueCheckList();
         ArrayList<CheckBoxBean> caseIssueList = new ArrayList<CheckBoxBean>();
-
-        // copy existing issues for sessionfrm
-        for (int idx = 0; idx < existingCaseIssueList.length; ++idx) {
-            caseIssueList.add(existingCaseIssueList[idx]);
+        CheckBoxBean[] existingCaseIssueList = null;
+
+        if (sessionFrm != null) {
+           existingCaseIssueList = sessionFrm.getIssueCheckList();
         }
 
+
+if (existingCaseIssueList != null) {
+    // copy existing issues for sessionfrm
+    for (CheckBoxBean bean : existingCaseIssueList) {
+        caseIssueList.add(bean);
+    }
+} else {
+    logger.info("No existingCaseIssueList found in session form — proceeding with empty list.");
+}     
+
         // first we check if any notes have been removed
         Set<CaseManagementIssue> noteIssues = note.getIssues();
         Iterator<CaseManagementIssue> iter = noteIssues.iterator();
@@ -3243,6 +3263,7 @@ protected CaseManagementCPP copyNote2cpp(CaseManagementCPP cpp, CaseManagementNo
         String separator = "\n-----[[" + d + "]]-----\n";
         for (CaseManagementIssue issue : issueSet) {
             String code = issue.getIssue().getCode();
+            text = new StringBuilder(); // Reset text for each issue
             if (code.equals("OMeds")) {
                 text.append(cpp.getFamilyHistory());
                 text.append(separator);

src/main/java/org/oscarehr/casemgmt/web/CaseManagementView2Action.java

@@ -1298,6 +1298,8 @@ public String listNotes() throws Exception {
             return null;
         }
 
+        System.out.println("Notes: " + notes);
+
         return "listNotes";
     }
 

src/main/webapp/WEB-INF/web.xml

@@ -43,12 +43,53 @@
 	<filter>
 		<filter-name>struts2</filter-name>
 		<filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</filter-class>
+		<init-param>
+			<param-name>actionPackages</param-name>
+			<param-value>org.oscarehr,oscar</param-value>
+		</init-param>
+		<init-param>
+			<param-name>struts.devMode</param-name>
+			<param-value>false</param-value>
+		</init-param>
+		<init-param>
+			<param-name>struts.configuration.files</param-name>
+			<param-value>struts-default.xml,struts-plugin.xml,struts.xml</param-value>
+		</init-param>
+		<init-param>
+			<param-name>struts.action.extension</param-name>
+			<param-value>do</param-value>
+		</init-param>
+		<init-param>
+			<param-name>struts.enable.SlashesInActionNames</param-name>
+			<param-value>true</param-value>
+		</init-param>
+		<init-param>
+			<param-name>struts.mapper.alwaysSelectFullNamespace</param-name>
+			<param-value>false</param-value>
+		</init-param>
+		<init-param>
+			<param-name>struts.custom.i18n.resources</param-name>
+			<param-value>oscarResources</param-value>
+		</init-param>
+		<init-param>
+			<param-name>struts.serve.static</param-name>
+			<param-value>true</param-value>
+		</init-param>
+		<init-param>
+			<param-name>struts.serve.static.browserCache</param-name>
+			<param-value>true</param-value>
+		</init-param>
+		<init-param>
+			<param-name>struts.action.excludePattern</param-name>
+			<param-value>.*\.(css|js|png|jpg|gif)$</param-value>
+		</init-param>
 	</filter>
 	<filter-mapping>
 		<filter-name>struts2</filter-name>
 		<url-pattern>/*</url-pattern>
 		<dispatcher>REQUEST</dispatcher>
 		<dispatcher>FORWARD</dispatcher>
+		<dispatcher>INCLUDE</dispatcher>
 	</filter-mapping>
     <filter>
             <filter-name>WebServiceSessionInvalidatingFilter</filter-name>
@@ -521,6 +562,15 @@
 	</welcome-file-list>
 
 	<error-page>
+		<error-code>404</error-code>
+		<location>/errorpage.jsp</location>
+	</error-page>
+	<error-page>
+		<error-code>500</error-code>
+		<location>/errorpage.jsp</location>
+	</error-page>
+	<error-page>
+		<exception-type>java.lang.Exception</exception-type>
 		<location>/errorpage.jsp</location>
 	</error-page>
 </web-app>

src/main/webapp/casemgmt/ChartNotes.jsp

@@ -576,7 +576,7 @@
     <input type="hidden" name="printRx" id="printRx" value="false">
     <input type="hidden" name="printLabs" id="printLabs" value="false">
     <input type="hidden" name="printPreventions" id="printPreventions" value="false">
-    <input type="hidden" name="encType" id="encType" value="">
+    <input type="hidden" name="encType" id="encType" value="<c:out value="${caseManagementEntryForm.caseNote.encounter_type}" default="" />">
     <input type="hidden" name="pType" id="pType" value="">
     <input type="hidden" name="pStartDate" id="pStartDate" value="">
     <input type="hidden" name="pEndDate" id="pEndDate" value="">

src/main/webapp/casemgmt/newCaseManagementView.jsp

@@ -67,9 +67,8 @@
         <!-- social history -->
         <div id="divR1I1" class="topBox">
         </div>
-
+        <!-- medical history -->
         <div id="divR1I2" class="topBox">
-
         </div>
     </div>
 

src/main/webapp/casemgmt/newEncounterLayout.jsp

@@ -605,17 +605,34 @@
     </div>
     <!-- hovering divs -->
     <div id="showEditNote" class="showEdContent">
-        <form id="frmIssueNotes" action="" method="post"
-              onsubmit="return updateCPPNote();">
-            <input type="hidden" id="reloadUrl" name="reloadUrl" value="">
-            <input type="hidden" id="containerDiv" name="containerDiv" value="">
-            <input type="hidden" id="issueChange" name="issueChange" value="">
-            <input type="hidden" id="archived" name="archived" value="false">
-            <input type="hidden" id="annotation_attrib" name="annotation_attrib">
-            <h3 id="winTitle"></h3>
-
-            <textarea cols="50" rows="15" id="noteEditTxt"
-                      name="value" class="boxsizingBorder"></textarea>
+    <form id="frmIssueNotes"
+            action=""  
+            method="post"
+            onsubmit="return updateCPPNote();">
+
+    <!-- Injected by your showEdit(...) call -->
+    <input type="hidden"
+           id="containerDiv"
+           name="containerDiv"
+           value="" />
+
+    <input type="hidden"
+           id="reloadUrl"
+           name="reloadUrl"
+           value="" />
+
+    <!-- other fields -->
+    <input type="hidden" id="issueChange" name="issueChange" value="">
+    <input type="hidden" id="archived"    name="archived"    value="false">
+    <input type="hidden" id="annotation_attrib" name="annotation_attrib">
+
+    <h3 id="winTitle"></h3>
+
+            <textarea id="noteEditTxt"
+              name="value"
+              cols="50"
+              rows="15"
+              class="boxsizingBorder"></textarea>
             <br>
 
             <table>
@@ -712,38 +729,70 @@
                 </tr>
             </table>
             <div class="control-panel">
+                <!-- these two should already be present, set by showEdit(...) -->
+                <input type="hidden" id="containerDiv" name="containerDiv" value="${param.containerDiv}"/>
+                <input type="hidden" id="reloadUrl"    name="reloadUrl"    value="${param.reloadUrl}"/>
+
+                <!-- other hidden fields -->
                 <input type="hidden" id="startTag" value='<fmt:setBundle basename="oscarResources"/><fmt:message key="oscarEncounter.Index.startTime"/>'>
-                <input type="hidden" id="endTag" value='<fmt:setBundle basename="oscarResources"/><fmt:message key="oscarEncounter.Index.endTime"/>'>
-                <br> <span style="float: right; margin-right: 10px;">
-				<input
-                        type="image"
-                        src="<c:out value="${ctx}/oscarEncounter/graphics/copy.png"/>"
-                        title='<fmt:setBundle basename="oscarResources"/><fmt:message key="oscarEncounter.Index.btnCopy"/>'
-                        onclick="copyCppToCurrentNote(); return false;"> <input
+                <input type="hidden" id="endTag"   value='<fmt:setBundle basename="oscarResources"/><fmt:message key="oscarEncounter.Index.endTime"/> '>
+                <input type="hidden" id="issueChange"        name="issueChange"        value=""/>
+                <input type="hidden" id="archived"           name="archived"           value="false"/>
+                <input type="hidden" id="annotation_attrib"  name="annotation_attrib"  value=""/>
+
+                <br>
+                <span style="float: right; margin-right: 10px;">
+                    <!-- Copy -->
+                    <input
                     type="image"
-                    src="<c:out value="${ctx}/oscarEncounter/graphics/annotation.png"/>"
-                    title='<fmt:setBundle basename="oscarResources"/><fmt:message key="oscarEncounter.Index.btnAnnotation"/>'
-                    id="anno" style="padding-right: 10px;"> <input type="image"
-                                                                   src="<c:out value="${ctx}/oscarEncounter/graphics/edit-cut.png"/>"
-                                                                   title='<fmt:setBundle basename="oscarResources"/><fmt:message key="oscarEncounter.Index.btnArchive"/>'
-                                                                   onclick="$('archived').value='true';"
-                                                                   style="padding-right: 10px;">
-				<input type="image"
-                       src="<c:out value="${ctx}/oscarEncounter/graphics/note-save.png"/>"
-                       title='<fmt:setBundle basename="oscarResources"/><fmt:message key="oscarEncounter.Index.btnSignSave"/>'
-                       onclick="$('archived').value='false';" style="padding-right: 10px;">
-				<input type="image"
-                       src="<c:out value="${ctx}/oscarEncounter/graphics/system-log-out.png"/>"
-                       title='<fmt:setBundle basename="oscarResources"/><fmt:message key="global.btnExit"/>'
-                       onclick="this.focus();$('channel').style.visibility ='visible';$('showEditNote').style.display='none';return false;">
-			</span>
+                    src="<c:out value='${ctx}/oscarEncounter/graphics/copy.png'/>"
+                    title="<fmt:message key='oscarEncounter.Index.btnCopy'/>"
+                    onclick="copyCppToCurrentNote(); return false;"
+                    />
+
+                    <!-- Annotation -->
+                    <input
+                    type="image"
+                    src="<c:out value='${ctx}/oscarEncounter/graphics/annotation.png'/>"
+                    title="<fmt:message key='oscarEncounter.Index.btnAnnotation'/>"
+                    id="anno"
+                    style="padding-right: 10px;"
+                    />
+
+                    <!-- Archive -->
+                    <input
+                    type="image"
+                    src="<c:out value='${ctx}/oscarEncounter/graphics/edit-cut.png'/>"
+                    title="<fmt:message key='oscarEncounter.Index.btnArchive'/>"
+                    onclick="document.getElementById('archived').value='true'; return false;"
+                    style="padding-right: 10px;"
+                    />
+
+                    <!-- **Save** (now a true submit) -->
+                    <input
+                    type="image"
+                    src="<c:out value='${ctx}/oscarEncounter/graphics/note-save.png'/>"
+                    title="<fmt:message key='oscarEncounter.Index.btnSignSave'/>"
+                    onclick="document.getElementById('archived').value='false';"
+                    style="padding-right: 10px;"
+                    />
+
+                    <!-- **Cancel** -->
+                    <input
+                    type="image"
+                    src="<c:out value='${ctx}/oscarEncounter/graphics/system-log-out.png'/>"
+                    title="<fmt:message key='global.btnExit'/>"
+                    onclick="document.getElementById('showEditNote').style.display='none'; return false;"
+                    />
+                </span>
+
                 <label for="position">
-                    <fmt:setBundle basename="oscarResources"/><fmt:message key="oscarEncounter.Index.btnPosition"/>
+                    <fmt:message key="oscarEncounter.Index.btnPosition"/>
                 </label>
                 <select id="position" name="position">
                     <option id="popt0" value="0">1</option>
                 </select>
-            </div>
+                </div>
             <div id="issueNoteInfo"></div>
             <div id="issueListCPP"
                  style="background-color: #FFFFFF; height: 200px; width: 350px; position: absolute; z-index: 1; display: none; overflow: auto;">
@@ -762,6 +811,19 @@
                     src="<c:out value="${ctx}/oscarEncounter/graphics/busy.gif"/>"
                     alt="<fmt:setBundle basename="oscarResources"/><fmt:message key="oscarEncounter.Index.btnWorking"/>"></span>
             </div>
+<fmt:setBundle basename="oscarResources"/>
+
+<c:set var="formKey" value="caseManagementEntryForm${demographicNo}" />
+<c:set var="sessionFrm" value="${sessionScope[formKey]}" />
+
+<c:forEach var="checkbox" items="${sessionFrm.issueCheckList}">
+    <input type="checkbox"
+           name="issue_id"
+           value="${checkbox.issue.issue_id}"
+           <c:if test="${checkbox.checked == 'on'}">checked</c:if> />
+    ${checkbox.issue.description}
+</c:forEach>
+
         </form>
     </div>
     <div id="printOps" class="printOps">