dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1550
committer: Viet <Viet@Viet-Laptop>
branch nick: trunk
timestamp: Thu 2010-03-04 19:12:32 +0530
message:
  Fix somes bugs.
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/ShowAddPatientFormAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/ValidatePatientAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientattributegroup/GetPatientAttributeGroupAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientIdentifierType.js


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription.

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/ShowAddPatientFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/ShowAddPatientFormAction.java	2010-02-22 09:19:15 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/ShowAddPatientFormAction.java	2010-03-04 13:42:32 +0000
@@ -108,13 +108,6 @@
        
         noGroupAttributes = patientAttributeService.getPatientAttributesNotGroup();
         
-        // Remove Child Contact Name, Child Contact RelationShip Type attributes from this list 
-        PatientAttribute attr = new PatientAttribute();
-        attr.setName( PatientAttributePopulator.ATTRIBUTE_CHILD_CONTACT_NAME );
-        noGroupAttributes.remove( attr );
-        attr.setName( PatientAttributePopulator.ATTRIBUTE_CHILD_RELATIONSHIP_TYPE );
-        noGroupAttributes.remove( attr );
-        
         attributeGroups  = patientAttributeGroupService.getAllPatientAttributeGroups();
 
         return SUCCESS;

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/ValidatePatientAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/ValidatePatientAction.java	2010-03-03 11:02:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/ValidatePatientAction.java	2010-03-04 13:42:32 +0000
@@ -227,7 +227,6 @@
             }
         }
         
-        
         // Check Under age information
         
         if( underAge )

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientattributegroup/GetPatientAttributeGroupAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientattributegroup/GetPatientAttributeGroupAction.java	2010-01-29 03:08:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientattributegroup/GetPatientAttributeGroupAction.java	2010-03-04 13:42:32 +0000
@@ -107,7 +107,7 @@
     {
         patientAttributeGroup = patientAttributeGroupService.getPatientAttributeGroup( id );
 
-        patientAttributes = new ArrayList<PatientAttribute>( patientAttributeService.getOptionalPatientAttributesWithoutGroup() );
+        patientAttributes = new ArrayList<PatientAttribute>( patientAttributeService.getPatientAttributesNotGroup() );
 
         Collections.sort( patientAttributes, new PatientAttributeComparator() );
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientIdentifierType.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientIdentifierType.js	2010-02-22 09:19:15 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientIdentifierType.js	2010-03-04 13:42:32 +0000
@@ -44,7 +44,6 @@
     
     if ( type == 'success' )
     {
-        alert(message);
     	window.location.href = 'patientIdentifierType.action';
     }
     else if ( type = 'error' )
@@ -81,7 +80,6 @@
     if ( type == 'success' )
     {
         var form = document.getElementById( 'addPatientIdentifierTypeForm' ); 
-        alert(jQuery("#mandatory").val());
         form.submit();
     }
     else if ( type == 'error' )