=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientattributevalue/PatientAttributeValueDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientattributevalue/PatientAttributeValueDeletionHandler.java 2010-10-22 06:43:14 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientattributevalue/PatientAttributeValueDeletionHandler.java 2011-01-20 04:05:32 +0000
@@ -31,6 +31,7 @@
import org.hisp.dhis.patient.Patient;
import org.hisp.dhis.patient.PatientAttribute;
+import org.hisp.dhis.patient.PatientService;
import org.hisp.dhis.system.deletion.DeletionHandler;
/**
@@ -52,11 +53,18 @@
this.patientAttributeValueService = patientAttributeValueService;
}
+ private PatientService patientService;
+
+ public void setPatientService( PatientService patientService ) {
+ this.patientService = patientService;
+ }
+
// -------------------------------------------------------------------------
// DeletionHandler implementation
// -------------------------------------------------------------------------
- @Override
+
+ @Override
public String getClassName()
{
return PatientAttributeValue.class.getSimpleName();
@@ -83,7 +91,11 @@
{
for ( PatientAttributeValue attributeValue : attributeValues )
{
+ Patient patient = attributeValue.getPatient();
patientAttributeValueService.deletePatientAttributeValue( attributeValue );
+
+ patient.getAttributes().remove(patientAttribute);
+ patientService.updatePatient( patient );
}
}
}
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml 2011-01-12 02:40:43 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml 2011-01-20 04:05:32 +0000
@@ -313,6 +313,7 @@
+