dhis-mobile-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 241
committer: Hong Em <em.hispvietnam@xxxxxxxxx>
branch nick: lwuit-tracking
timestamp: Thu 2014-10-30 11:12:07 +0700
message:
  Fixed Bug: Add instance data entry fields are incorrect
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	2014-09-03 11:23:09 +0000
+++ src/org/hisp/dhis/mobile/view/PersonRegistrationView.java	2014-10-30 04:12:07 +0000
@@ -126,6 +126,23 @@
                     mainForm.addComponent( comboBox );
                     patientAttributeValueVector.addElement( comboBox );
                 }
+
+                else if ( patientAttribute.getType().equals( "optionSet" ) )
+                {
+                    ComboBox comboBox = new ComboBox();
+                    comboBox.setLabelForComponent( patientAttributeLabel );
+
+                    for ( int j = 0; j < patientAttribute.getOptionSet().getOptions().size(); j++ )
+                    {
+
+                        comboBox.addItem( (String) patientAttribute.getOptionSet().getOptions().elementAt( j ) );
+                    }
+
+                    mainForm.addComponent( comboBox );
+                    patientAttributeValueVector.addElement( comboBox );
+
+                }
+
                 else if ( patientAttribute.getType().equals( "combo" ) )
                 {
                     LogMan.log( LogMan.DEBUG, "UI," + CLASS_TAG, "adding combo box" );
@@ -154,7 +171,8 @@
                     patientAttributeTextField = new TextField();
                     patientAttributeTextField.setLabelForComponent( patientAttributeLabel );
 
-                    if ( patientAttribute.getType().equals( "number" ) )
+                    if ( patientAttribute.getType().equals( "number" )
+                        || patientAttribute.getType().equals( "phoneNumber" ) )
                     {
                         patientAttributeTextField.setConstraint( TextField.NUMERIC );
                         patientAttributeTextField.setInputModeOrder( new String[] { "123" } );