OpenMRS

Timestamp:

08/06/08 17:17:55 (5 months ago)

Author:

mseaton

Message:

synchronization_bidirectional_branch: merge from [4734] to [5181].

Files:

• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/Person.java (modified) (7 diffs)

openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/Person.java

@@ -427 +427 @@
-                                attributeMap = null;
-        }
+                
+        /**
+         * Convenience Method
+         * Returns the first non-voided person attribute matching a person attribute type
+         * 
+         * @param pat
+         * @return PersonAttribute
+         */
+        public PersonAttribute getAttribute(PersonAttributeType pat) {
+                        if (pat != null)
+                                for (PersonAttribute attribute : getAttributes()) {
+                                        if (pat.equals(attribute.getAttributeType()) && !attribute.isVoided()) {
+                                                return attribute;
+                                        }
+                                }       
+                return null;
+        }
-        
-        /**
@@ -435 +452 @@
-        public PersonAttribute getAttribute(String attributeName) {
-                if (attributeName != null)
-ctiveA
+
-                                PersonAttributeType type = attribute.getAttributeType();
-
+ && !attribute.isVoided()
-                                        return attribute;
-                                }
@@ -452 +469 @@
-        public PersonAttribute getAttribute(Integer attributeTypeId) {
-                for (PersonAttribute attribute : getActiveAttributes()) {
-
+ && !attribute.isVoided()
-                                return attribute;
-                        }
-
-
+
-                return null;
-        }
@@ -466 +482 @@
-         */
-        public List<PersonAttribute> getAttributes(String attributeName) {
-attributes
+ret
-                
-                for (PersonAttribute attribute : getActiveAttributes()) {
-                        PersonAttributeType type = attribute.getAttributeType();
-
-attributes
+ && !attribute.isVoided()
+ret
-                        }
-                }
-                
-attributes
+ret
-        }
-        
@@ -484 +500 @@
-         */
-        public List<PersonAttribute> getAttributes(Integer attributeTypeId) {
-attributes
+ret
-                
-                for (PersonAttribute attribute : getActiveAttributes()) {
-PersonAttributeId()
-attributes
+AttributeType().getPersonAttributeTypeId()) && !attribute.isVoided(
+ret
-                        }
-                }
-                
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        
@@ -588 +620 @@
-         */
-        public PersonName getPersonName() {
-names
+getNames()
-                        return (PersonName) names.toArray()[0];
-                } else {
@@ -688 +720 @@
-                
-                return age;
+        }
+        
+        /**
+         * Convenience method: sets a person's birth date from an age as of the given date
+         * Also sets flag indicating that the birth date is inexact.
+         * This sets the person's birth date to January 1 of the year that matches this age and date
+         * 
+         * @param age (the age to set)
+         * @param onDate (null defaults to today)
+         */
+        public void setBirthdateFromAge(int age, Date ageOnDate) {
+                Calendar c = Calendar.getInstance();
+                c.setTime(ageOnDate == null ? new Date() : ageOnDate);
+                c.set(Calendar.DATE, 1);
+                c.set(Calendar.MONTH, Calendar.JANUARY);
+                c.add(Calendar.YEAR, -1*age);
+                setBirthdate(c.getTime());
+                setBirthdateEstimated(true);
-        }
-