OpenMRS

Timestamp:

05/09/08 00:12:00 (8 months ago)

Author:

djazayeri

Message:

Reorganized options in Data Export simple column to order suggested by Cheryl and Ada. You may now pick any program, workflow, or drug set, instead of just the PIH ones. (PIH-specific hackiness still remains for relationships.)

Added BMI to patient dashboard. This should work with weights in kg/lb and heights in cm/m/in, although I've only tried for kg & cm. Make sure to set the global properties for concept.weight and concept.height.

Files:

• openmrs/trunk/src/web/org/openmrs/web/taglib/ConceptTag.java (modified) (4 diffs)

openmrs/trunk/src/web/org/openmrs/web/taglib/ConceptTag.java

@@ -36 +36 @@
-        // Properties accessible through tag attributes
-        private Integer conceptId;
+        private String conceptName;
-        private String var;
-        private String nameVar;
@@ -46 +47 @@
-                
-                // Search for a concept by id
-
+
+
+
+
+
-                if (c == null) {
-                        if (conceptId != null && conceptId > 0)
-                                log.warn("ConceptTag is unable to find a concept with conceptId '" + conceptId + "'");
+                        if (conceptName != null)
+                                log.warn("ConceptTag is unable to find a concept with conceptName '" + conceptName + "'");
-                        return SKIP_BODY;
-                }
@@ -66 +73 @@
-                        }
-                }
-
-
-
+
+
+
+
+
-                
-
+
+
+
-        
-        // If the Concept is a Set, get members of that Set
@@ -109 +120 @@
-                this.conceptId = conceptId;
-        }
+
+        /**
+     * @return the conceptName
+     */
+    public String getConceptName() {
+        return conceptName;
+    }
+
+        /**
+     * @param conceptName the conceptName to set
+     */
+    public void setConceptName(String conceptName) {
+        this.conceptName = conceptName;
+    }
-
-        /**