dhis-mobile-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 188
committer: Hong Em <em.hispvietnam@xxxxxxxxx>
branch nick: lwuit-tracking
timestamp: Thu 2013-11-14 16:48:20 +0700
message:
  fixed validation for Approximated dob type
modified:
  src/org/hisp/dhis/mobile/view/PersonRegistrationView.java


--
lp:~dhis-mobile-devs/dhis-mobile/lwuit-tracking
https://code.launchpad.net/~dhis-mobile-devs/dhis-mobile/lwuit-tracking

Your team DHIS mobile developers is subscribed to branch lp:~dhis-mobile-devs/dhis-mobile/lwuit-tracking.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis-mobile-devs/dhis-mobile/lwuit-tracking/+edit-subscription

=== modified file 'src/org/hisp/dhis/mobile/view/PersonRegistrationView.java'
--- src/org/hisp/dhis/mobile/view/PersonRegistrationView.java	2013-11-05 03:17:15 +0000
+++ src/org/hisp/dhis/mobile/view/PersonRegistrationView.java	2013-11-14 09:48:20 +0000
@@ -365,7 +365,7 @@
             String dobType = (String) getDateOfBirthComboBox().getSelectedItem();
             String dateOfBirth = getDateOfBirthTextFiled().getText();
             String incidentDate = getTxtIncidentDate().getText();
-            
+
             isValid = true;
             // Validate Date of Birth
             validateDOB( dobType, dateOfBirth );
@@ -496,6 +496,7 @@
 
         if ( dobType.equalsIgnoreCase( "Approximated" ) && (dateOfBirth != null && !"".equals( dateOfBirth )) )
         {
+
             try
             {
                 birthYear = currentYear - Integer.parseInt( dateOfBirth );
@@ -505,6 +506,7 @@
             {
                 e.printStackTrace();
             }
+
         }
 
         Patient patient = new Patient();
@@ -624,6 +626,12 @@
             getDobWrongFortmatLabel().setText( "(*):Required Field" );
             isValid = false;
         }
+        else if ( dobType.equalsIgnoreCase( "Approximated" ) && Character.isDigit( dateOfBirth.charAt( 0 ) ) == false )
+        {
+            getDobWrongFortmatLabel().setText( Text.DOB_WRONG_FORMAT() );
+            isValid = false;
+        }
+
         else
         {
             getDobWrongFortmatLabel().setText( "" );