OpenMRS

Timestamp:

05/06/08 00:36:37 (8 months ago)

Author:

djazayeri

Message:

Allow voiding the obs that exits a patient from care. Added global property listeners and supporting infrastructure. The xml for this needs to be changed slightly, but the method signatures are fine.
Also fixing CR/LF issue in a few files

Files:

• openmrs/trunk/web/WEB-INF/view/portlets/patientOverview.jsp (modified) (5 diffs)

openmrs/trunk/web/WEB-INF/view/portlets/patientOverview.jsp

@@ -3 +3 @@
-<openmrs:htmlInclude file="/dwr/interface/DWRRelationshipService.js" />
-<openmrs:htmlInclude file="/dwr/interface/DWRPatientService.js" />
+<openmrs:htmlInclude file="/dwr/interface/DWRObsService.js" />
-<openmrs:htmlInclude file="/dwr/engine.js" />
-<openmrs:htmlInclude file="/dwr/util.js" />
@@ -9 +10 @@
-<openmrs:globalProperty key="use_patient_attribute.healthCenter" defaultValue="false" var="showHealthCenter"/>
-
- parameters="patientId=${model.patient.patientId}"
+
-        <openmrs:hasPrivilege privilege="${extension.requiredPrivilege}">
-                <div class="boxHeader${model.patientVariation}"><spring:message code="${extension.title}" /></div>
-
+ 
-                <br />
-        </openmrs:hasPrivilege>
@@ -29 +30 @@
-        </table>
-        <table id="patientActions">
-                <openmrs:extensionPoint pointId="org.openmrs.patientDashboard.patientActionsContent" type="html" parameters="patientId=${model.patient.patientId}"/>
-                <tr>
-                <c:if test="${empty model.patientReasonForExit}">
@@ -132 +132 @@
-                </c:if>
-                <c:if test="${not empty model.patientReasonForExit}">
+                        <script type="text/javascript">
+                                <spring:message code="general.voidReasonQuestion" var="reasonText"/>
+                                function handleCancelExit() {
+                                        var reason = DWRUtil.getValue('cancelExitReason');
+                                        if (reason == '') {
+                                                alert("<spring:message code="general.required" arguments="${reasonText}"/>");
+                                                return;
+                                        } else {
+                                                DWRObsService.voidObservation(${model.patientReasonForExit.obsId}, reason,
+                                                        function() { window.location.reload(); } );
+                                        }
+                                }
+                        </script>
-                        <td id="patientActionsOutcome">
-
+
+
+
+
+
+
+
+
-                        </td>
-                </c:if>
@@ -169 +189 @@
-        <openmrs:portlet url="personRelationships" size="normal" patientId="${patient.patientId}" />
-</div>
-