OpenMRS

Timestamp:

06/26/08 09:38:04 (5 months ago)

Author:

catullus

Message:

double_entry_reconcile: warn if user is logged out.

Files:

• openmrs-modules/doubleentryreconciliation/web/module/reconcileForm.jsp (modified) (1 diff)
• openmrs-modules/doubleentryreconciliation/web/src/org/openmrs/module/doubleentryreconciliation/web/DWRDoubleEntryReconciliation.java (modified) (3 diffs)

openmrs-modules/doubleentryreconciliation/web/module/reconcileForm.jsp

@@ -24 +24 @@
-
-<script type="text/javascript">
+        function errh(msg) {
+                alert(msg);
+        }
+        DWREngine.setErrorHandler(errh);
+
-        function chooseObs(rowToHide, goodEncId, goodObsId, badEncId, badObsId) {
-                hideDiv(rowToHide);

openmrs-modules/doubleentryreconciliation/web/src/org/openmrs/module/doubleentryreconciliation/web/DWRDoubleEntryReconciliation.java

@@ -23 +23 @@
-        public DWRDoubleEntryReconciliation() { }
-        
+        private void checkLoggedOut(){
+                if(!Context.isAuthenticated())
+                        throw new IllegalArgumentException("You're logged out.  Action did not go through.");
+        }
+        
-        public boolean voidObsGroup(Integer obsGroupId) {
-
+
+
-                throw new NullPointerException("obsGroupId cannot be null");
-            if (NEW_OBS_GROUPS) {
@@ -43 +49 @@
-        
-        public boolean copyObsGroupToEncounter(Integer obsGroupId, Integer encounterId) {
-
+
+
-                throw new NullPointerException("obsGroupId cannot be null");
-            if (encounterId == null)
@@ -131 +138 @@
-        
-        public boolean chooseCorrectObs(Integer goodEncId, Integer goodObsId, Integer badEncId, Integer badObsId) {
+                checkLoggedOut();
-                if (goodEncId == null)
-                        throw new NullPointerException("goodEncId cannot be null");