← Back to team overview

dhis-mobile-devs team mailing list archive

[Branch ~dhis-mobile-devs/dhis-mobile/lwuit-tracking] Rev 171: minor

 

------------------------------------------------------------
revno: 171
committer: Lai <lai.hispvietnam@xxxxxxxxx>
branch nick: lwuit-tracking
timestamp: Tue 2013-10-22 14:31:38 +0700
message:
  minor
modified:
  src/org/hisp/dhis/mobile/connection/ConnectionManager.java
  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/connection/ConnectionManager.java'
--- src/org/hisp/dhis/mobile/connection/ConnectionManager.java	2013-10-09 03:09:25 +0000
+++ src/org/hisp/dhis/mobile/connection/ConnectionManager.java	2013-10-22 07:31:38 +0000
@@ -39,6 +39,7 @@
 import org.hisp.dhis.mobile.connection.task.LoginTask;
 import org.hisp.dhis.mobile.connection.task.PersonRegistrationTask;
 import org.hisp.dhis.mobile.connection.task.RegisterAllOfflinePatientTask;
+import org.hisp.dhis.mobile.connection.task.SaveUnregisteredPersonTask;
 import org.hisp.dhis.mobile.connection.task.SendLostToFollowUpTask;
 import org.hisp.dhis.mobile.connection.task.UpdateContactTask;
 import org.hisp.dhis.mobile.connection.task.UpdateDataSetTask;
@@ -242,6 +243,12 @@
         SendLostToFollowUpTask sendLostToFollowUpTask = new SendLostToFollowUpTask( lostEvent );
         runTask( sendLostToFollowUpTask );
     }
+    
+    public static void saveUnregisterdPatient( Patient patient )
+    {
+        SaveUnregisteredPersonTask saveUnregisteredPersonTask = new SaveUnregisteredPersonTask( patient );
+        runTask( saveUnregisteredPersonTask );
+    }
 
     public static void runTask( AbstractTask task )
     {

=== modified file 'src/org/hisp/dhis/mobile/view/PersonRegistrationView.java'
--- src/org/hisp/dhis/mobile/view/PersonRegistrationView.java	2013-10-22 04:04:04 +0000
+++ src/org/hisp/dhis/mobile/view/PersonRegistrationView.java	2013-10-22 07:31:38 +0000
@@ -38,7 +38,7 @@
     implements ActionListener
 {
 
-    private Form personRegistrationForm;
+    private Form mainForm;
 
     private Label fullNameLabel;
 
@@ -101,6 +101,10 @@
     private Vector requiredIdentifierVector = new Vector();
 
     private Vector requireAttributeVector = new Vector();
+    
+    private Vector offlinePatientAttributeVector;
+
+    private Vector offlinePatientIdentifierVector;
 
     private String enrollProgramId = "";
 
@@ -113,14 +117,14 @@
     public void prepareView()
     {
         System.gc();
-        getPersonRegistrationForm();
-        personRegistrationForm.removeAll();
-        this.setDobWrongFortmatLabel( null );
-        this.setRequiredLabel( null );
-        this.patientIdentifierVector = null;
-        this.offlinePatientIdentifierVector = null;
-        this.patientIdentifierValueVector = new Vector();
-        this.patientAttributeValueVector = new Vector();
+        getMainForm();
+        mainForm.removeAll();
+        /*dobWrongFortmatLabel = null;
+        requiredLabel = null;
+        patientIdentifierVector = null;
+        offlinePatientIdentifierVector = null;*/
+        patientIdentifierValueVector = new Vector();
+        patientAttributeValueVector = new Vector();
 
         fullNameLabel = new Label( "Fullname(*)" );
         genderLabel = new Label( Text.GENDER() );
@@ -165,16 +169,16 @@
         try
         {
 
-            this.patientIdentifierVector = PatientIdentifierRecordStore.loadPatientIdentifiers();
-            this.offlinePatientIdentifierVector = PatientIdentifierRecordStore.loadOfflinePatientIdentifiers();
+            patientIdentifierVector = PatientIdentifierRecordStore.loadPatientIdentifiers();
+            offlinePatientIdentifierVector = PatientIdentifierRecordStore.loadOfflinePatientIdentifiers();
 
-            int onlineSize = this.patientIdentifierVector.size();
+            int onlineSize = patientIdentifierVector.size();
 
             if ( onlineSize < 0 )
             {
-                this.patientIdentifierVector = this.offlinePatientIdentifierVector;
+                patientIdentifierVector = offlinePatientIdentifierVector;
             }
-            System.out.println( "Identifier Type Size: " + patientIdentifierVector.size() );
+
             for ( int i = 0; i < patientIdentifierVector.size(); i++ )
             {
                 PatientIdentifier patientIdentifier = (PatientIdentifier) patientIdentifierVector.elementAt( i );
@@ -182,12 +186,12 @@
                 requiredIdentifierVector.addElement( patientIdentifier.getIdentifierType().substring(
                     patientIdentifier.getIdentifierType().length() - 1 ) );
 
-                this.patientIdentifierLabel = new Label( patientIdentifier.getIdentifierType() );
-                this.patientIdentifierTextField = new TextField();
-                this.patientIdentifierTextField.setLabelForComponent( patientIdentifierLabel );
+                patientIdentifierLabel = new Label( patientIdentifier.getIdentifierType() );
+                patientIdentifierTextField = new TextField();
+                patientIdentifierTextField.setLabelForComponent( patientIdentifierLabel );
 
-                personRegistrationForm.addComponent( patientIdentifierLabel );
-                personRegistrationForm.addComponent( patientIdentifierTextField );
+                mainForm.addComponent( patientIdentifierLabel );
+                mainForm.addComponent( patientIdentifierTextField );
                 patientIdentifierValueVector.addElement( patientIdentifierTextField );
 
             }
@@ -198,36 +202,36 @@
             e.printStackTrace();
         }
 
-        personRegistrationForm.addComponent( genderLabel );
-        personRegistrationForm.addComponent( genderComboBox );
+        mainForm.addComponent( genderLabel );
+        mainForm.addComponent( genderComboBox );
 
-        personRegistrationForm.addComponent( dateOfBirthLabel );
-        personRegistrationForm.addComponent( dobTypeDefinitionLink );
-        personRegistrationForm.addComponent( dateOfBirthComboBox );
-        personRegistrationForm.addComponent( dateOfBirthTextFiled );
-        personRegistrationForm.addComponent( getDobWrongFortmatLabel() );
+        mainForm.addComponent( dateOfBirthLabel );
+        mainForm.addComponent( dobTypeDefinitionLink );
+        mainForm.addComponent( dateOfBirthComboBox );
+        mainForm.addComponent( dateOfBirthTextFiled );
+        mainForm.addComponent( getDobWrongFortmatLabel() );
 
         if ( enrollProgramId != null )
         {
             Label lblIncidentDate = new Label("Incident date (*)");
-            personRegistrationForm.addComponent( lblIncidentDate );
-            personRegistrationForm.addComponent( getTxtIncidentDate() );
-            personRegistrationForm.addComponent( getRequiredLabel() );
+            mainForm.addComponent( lblIncidentDate );
+            mainForm.addComponent( getTxtIncidentDate() );
+            mainForm.addComponent( getRequiredLabel() );
         }
-        personRegistrationForm.addComponent( phoneNumberLabel );
-        personRegistrationForm.addComponent( phoneNumberTextField );
+        mainForm.addComponent( phoneNumberLabel );
+        mainForm.addComponent( phoneNumberTextField );
         
         
 
         // add attribute
         try
         {
-            this.patientAttributeVector = PatientAttributeRecordStore.loadPatientAttribute();
-            this.offlinePatientAttributeVector = PatientAttributeRecordStore.loadOfflinePatientAttribute();
-            int onlineSize = this.patientAttributeVector.size();
+            patientAttributeVector = PatientAttributeRecordStore.loadPatientAttribute();
+            offlinePatientAttributeVector = PatientAttributeRecordStore.loadOfflinePatientAttribute();
+            int onlineSize = patientAttributeVector.size();
             if ( onlineSize < 0 )
             {
-                this.patientAttributeVector = this.offlinePatientAttributeVector;
+                patientAttributeVector = offlinePatientAttributeVector;
             }
 
             for ( int i = 0; i < patientAttributeVector.size(); i++ )
@@ -236,8 +240,8 @@
                 requireAttributeVector.addElement( patientAttribute.getName().substring(
                     patientAttribute.getName().length() - 1 ) );
 
-                this.patientAttributeLabel = new Label( patientAttribute.getName() );
-                personRegistrationForm.addComponent( patientAttributeLabel );
+                patientAttributeLabel = new Label( patientAttribute.getName() );
+                mainForm.addComponent( patientAttributeLabel );
 
                 if ( patientAttribute.getType().equals( "bool" ) )
                 {
@@ -245,13 +249,13 @@
                     ComboBox comboBox = new ComboBox( option );
                     comboBox.setLabelForComponent( patientAttributeLabel );
 
-                    personRegistrationForm.addComponent( comboBox );
+                    mainForm.addComponent( comboBox );
                     patientAttributeValueVector.addElement( comboBox );
                 }
                 else
                 {
-                    this.patientAttributeTextField = new TextField();
-                    this.patientAttributeTextField.setLabelForComponent( patientAttributeLabel );
+                    patientAttributeTextField = new TextField();
+                    patientAttributeTextField.setLabelForComponent( patientAttributeLabel );
 
                     if ( patientAttribute.getType().equals( "number" ) )
                     {
@@ -259,7 +263,7 @@
                         patientAttributeTextField.setInputModeOrder( new String[] { "123" } );
                     }
 
-                    personRegistrationForm.addComponent( patientAttributeTextField );
+                    mainForm.addComponent( patientAttributeTextField );
                     patientAttributeValueVector.addElement( patientAttributeTextField );
                 }
             }
@@ -274,231 +278,31 @@
     public void showView()
     {
         prepareView();
-        getPersonRegistrationForm().show();
+        getMainForm().show();
 
     }
 
-    public Form getPersonRegistrationForm()
+    public Form getMainForm()
     {
-        if ( personRegistrationForm == null )
+        if ( mainForm == null )
         {
-            personRegistrationForm = new Form( Text.PERSON_REGISTRATION() );
-            personRegistrationForm.setLayout( new BoxLayout( BoxLayout.Y_AXIS ) );
-            personRegistrationForm.setTransitionOutAnimator( CommonTransitions.createSlide(
+            mainForm = new Form( Text.PERSON_REGISTRATION() );
+            mainForm.setLayout( new BoxLayout( BoxLayout.Y_AXIS ) );
+            mainForm.setTransitionOutAnimator( CommonTransitions.createSlide(
                 CommonTransitions.SLIDE_HORIZONTAL, true, 200 ) );
-            personRegistrationForm.addCommand( getPersonRegistrationBackCommand() );
-            personRegistrationForm.addCommand( getPeronRegistrationSendCommand() );
-            personRegistrationForm.addCommand( getPersonRegistrationSaveCommand() );
-
-            personRegistrationForm.addCommandListener( this );
-        }
-
-        return personRegistrationForm;
-    }
-
-    public void setPersonRegistrationForm( Form personRegistrationForm )
-    {
-        this.personRegistrationForm = personRegistrationForm;
-    }
-
-    public Label getFullNameLabel()
-    {
-        return fullNameLabel;
-    }
-
-    public void setFullNameLabel( Label fullNameLabel )
-    {
-        this.fullNameLabel = fullNameLabel;
-    }
-
-    public Label getGenderLabel()
-    {
-        return genderLabel;
-    }
-
-    public void setGenderLabel( Label genderLabel )
-    {
-        this.genderLabel = genderLabel;
-    }
-
-    public Label getDateOfBirthLabel()
-    {
-        return dateOfBirthLabel;
-    }
-
-    public void setDateOfBirthLabel( Label dateOfBirthLabel )
-    {
-        this.dateOfBirthLabel = dateOfBirthLabel;
-    }
-
-    public Label getPhoneNumberLabel()
-    {
-        return phoneNumberLabel;
-    }
-
-    public void setPhoneNumberLabel( Label phoneNumberLabel )
-    {
-        this.phoneNumberLabel = phoneNumberLabel;
-    }
-
-    public TextField getFullNameTextField()
-    {
-        if ( fullNameTextField == null )
-        {
-            fullNameTextField = new TextField();
-        }
-        return fullNameTextField;
-    }
-
-    public void setFullNameTextField( TextField fullNameTextField )
-    {
-        this.fullNameTextField = fullNameTextField;
-    }
-
-    public ComboBox getGenderComboBox()
-    {
-        return genderComboBox;
-    }
-
-    public void setGenderComboBox( ComboBox genderComboBox )
-    {
-        this.genderComboBox = genderComboBox;
-    }
-
-    public ComboBox getDateOfBirthComboBox()
-    {
-        return dateOfBirthComboBox;
-    }
-
-    public void setDateOfBirthComboBox( ComboBox dateOfBirthComboBox )
-    {
-        this.dateOfBirthComboBox = dateOfBirthComboBox;
-    }
-
-    public TextField getPhoneNumberTextField()
-    {
-        if ( phoneNumberTextField == null )
-        {
-            phoneNumberTextField = new TextField();
-            phoneNumberTextField.setConstraint( TextField.NUMERIC );
-            phoneNumberTextField.setInputModeOrder( new String[] { "123" } );
-        }
-        return phoneNumberTextField;
-    }
-
-    public void setPhoneNumberTextField( TextField phoneNumberTextField )
-    {
-        this.phoneNumberTextField = phoneNumberTextField;
-    }
-
-    public Command getPersonRegistrationBackCommand()
-    {
-        if ( personRegistrationBackCommand == null )
-        {
-            personRegistrationBackCommand = new Command( Text.BACK() );
-        }
-        return personRegistrationBackCommand;
-    }
-
-    public void setPersonRegistrationBackCommand( Command personRegistrationBackCommand )
-    {
-        this.personRegistrationBackCommand = personRegistrationBackCommand;
-    }
-
-    public Command getPeronRegistrationSendCommand()
-    {
-        if ( personRegistrationSendCommand == null )
-        {
-            personRegistrationSendCommand = new Command( Text.SEND() );
-        }
-        return personRegistrationSendCommand;
-    }
-
-    public void setPeronRegistrationSendCommand( Command peronRegistrationSendCommand )
-    {
-        this.personRegistrationSendCommand = peronRegistrationSendCommand;
-    }
-
-    public Command getPersonRegistrationSaveCommand()
-    {
-        if ( personRegistrationSaveCommand == null )
-        {
-            personRegistrationSaveCommand = new Command( Text.SAVE() );
-        }
-        return personRegistrationSaveCommand;
-    }
-
-    public void setPersonRegistrationSaveCommand( Command personRegistrationSaveCommand )
-    {
-        this.personRegistrationSaveCommand = personRegistrationSaveCommand;
-    }
-
-    public TextField getDateOfBirthTextFiled()
-    {
-        return dateOfBirthTextFiled;
-    }
-
-    public void setDateOfBirthTextFiled( TextField dateOfBirthTextFiled )
-    {
-        this.dateOfBirthTextFiled = dateOfBirthTextFiled;
-    }
-
-    public ConnectionManager getConnectionManager()
-    {
-        return connectionManager;
-    }
-
-    public void setConnectionManager( ConnectionManager connectionManager )
-    {
-        this.connectionManager = connectionManager;
-    }
-
-    public Label getPatientIdentifierLabel()
-    {
-        return patientIdentifierLabel;
-    }
-
-    public void setPatientIdentifierLabel( Label patientIdentifierLabel )
-    {
-        this.patientIdentifierLabel = patientIdentifierLabel;
-    }
-
-    public Label getPatientAttributeLabel()
-    {
-        return patientAttributeLabel;
-    }
-
-    public void setPatientAttributeLabel( Label patientAttributeLabel )
-    {
-        this.patientAttributeLabel = patientAttributeLabel;
-    }
-
-    public TextField getPatientIdentifierTextField()
-    {
-        if ( patientIdentifierTextField == null )
-        {
-            patientIdentifierTextField = new TextField();
-        }
-        return patientIdentifierTextField;
-    }
-
-    public void setPatientIdentifierTextField( TextField patientIdentifierTextField )
-    {
-        this.patientIdentifierTextField = patientIdentifierTextField;
-    }
-
-    public TextField getPatientAttributeTextField()
-    {
-        if ( patientAttributeTextField == null )
-        {
-            patientAttributeTextField = new TextField();
-        }
-        return patientAttributeTextField;
-    }
-
-    public void setPatientAttributeTextField( TextField patientAttributeTextField )
-    {
-        this.patientAttributeTextField = patientAttributeTextField;
+            mainForm.addCommand( getPersonRegistrationBackCommand() );
+            mainForm.addCommand( getPeronRegistrationSendCommand() );
+            mainForm.addCommand( getPersonRegistrationSaveCommand() );
+
+            mainForm.addCommandListener( this );
+        }
+
+        return mainForm;
+    }
+
+    public void setMainForm( Form personRegistrationForm )
+    {
+        this.mainForm = personRegistrationForm;
     }
 
     public void actionPerformed( ActionEvent ae )
@@ -507,9 +311,9 @@
         if ( ae.getCommand().getCommandName().equals( Text.SEND() ) )
         {
 
-            String dobType = (String) this.getDateOfBirthComboBox().getSelectedItem();
-            String dateOfBirth = this.getDateOfBirthTextFiled().getText();
-            String incidentDate = this.getTxtIncidentDate().getText();
+            String dobType = (String) getDateOfBirthComboBox().getSelectedItem();
+            String dateOfBirth = getDateOfBirthTextFiled().getText();
+            String incidentDate = getTxtIncidentDate().getText();
 
             boolean validateDOB = true;
 
@@ -549,11 +353,11 @@
             {
                 patientAttributeValueVector.removeAllElements();
                 patientIdentifierValueVector.removeAllElements();
-                getPersonRegistrationForm().show();
+                getMainForm().show();
             }
             else
             {
-                this.patient = this.collectData();
+                patient = collectData();
 
                 nameBasedMIDlet.getWaitingView().showView();
                 ConnectionManager.setUrl( dhisMIDlet.getCurrentOrgUnit().getRegisterPersonUrl() );
@@ -580,8 +384,8 @@
         else if ( ae.getCommand().getCommandName().equals( Text.SAVE() ) )
         {
 
-            String dobType = (String) this.getDateOfBirthComboBox().getSelectedItem();
-            String dateOfBirth = this.getDateOfBirthTextFiled().getText();
+            String dobType = (String) getDateOfBirthComboBox().getSelectedItem();
+            String dateOfBirth = getDateOfBirthTextFiled().getText();
 
             boolean validateDOB = true;
 
@@ -595,15 +399,16 @@
                 patientAttributeValueVector.removeAllElements();
                 patientIdentifierValueVector.removeAllElements();
                 getDobWrongFortmatLabel().setText( Text.DOB_WRONG_FORMAT() );
-                getPersonRegistrationForm().show();
+                getMainForm().show();
             }
             else
             {
-                this.patient = this.collectData();
+                patient = collectData();
 
                 nameBasedMIDlet.getWaitingView().showView();
-                saveUnregisteredPersonTask = new SaveUnregisteredPersonTask( patient );
-                saveUnregisteredPersonTask.run();
+                /*saveUnregisteredPersonTask = new SaveUnregisteredPersonTask( patient );
+                saveUnregisteredPersonTask.run();*/
+                ConnectionManager.saveUnregisterdPatient( patient );
                 try
                 {
                     PatientIdentifierRecordStore.deleteRecordStore();
@@ -637,9 +442,33 @@
             nameBasedMIDlet.getProgramSelectView().getMainForm().show();
             patientAttributeValueVector.removeAllElements();
             patientIdentifierValueVector.removeAllElements();
-            requiredLabel = null;
             patientAttributeVector = null;
             patientIdentifierVector = null;
+            fullNameLabel = null;
+            genderLabel = null;
+            dateOfBirthLabel = null;
+            phoneNumberLabel = null;
+            patientIdentifierLabel = null;
+            patientAttributeLabel = null;
+            requiredLabel = null;
+            dobWrongFortmatLabel = null;
+            fullNameTextField = null;
+            genderComboBox = null;
+            dateOfBirthComboBox = null;
+            dateOfBirthTextFiled = null;
+            phoneNumberTextField = null;
+            patientIdentifierTextField = null;
+            patientAttributeTextField = null;
+            txtIncidentDate = null;
+            personRegistrationBackCommand = null;
+            personRegistrationSendCommand = null;
+            personRegistrationSaveCommand = null;
+            patientIdentifierValueVector = null;
+            patientAttributeValueVector = null;
+            requiredIdentifierVector = null;
+            requireAttributeVector = null;
+            offlinePatientAttributeVector = null;
+            offlinePatientIdentifierVector = null;
             System.gc();
         }
     }
@@ -649,10 +478,10 @@
         // No fullName for Uganda case
         // String fullName = this.getFullNameTextField().getText().trim();
         String fullName = "";
-        String gender = (String) this.getGenderComboBox().getSelectedItem();
-        String dobType = (String) this.getDateOfBirthComboBox().getSelectedItem();
-        String dateOfBirth = this.getDateOfBirthTextFiled().getText();
-        String phoneNumber = this.getPhoneNumberTextField().getText().trim();
+        String gender = (String) getGenderComboBox().getSelectedItem();
+        String dobType = (String) getDateOfBirthComboBox().getSelectedItem();
+        String dateOfBirth = getDateOfBirthTextFiled().getText();
+        String phoneNumber = getPhoneNumberTextField().getText().trim();
 
         Character dateOfBirthType = null;
         if ( dobType.equalsIgnoreCase( "Approximated" ) )
@@ -713,26 +542,26 @@
         patient.setBirthDate( dateOfBirth );
         if ( enrollProgramId != null )
         {
-            String incidentDate = this.getTxtIncidentDate().getText();
+            String incidentDate = getTxtIncidentDate().getText();
             patient.setIncidentDate( incidentDate );
         }
         
 
         try
         {
-            for ( int i = 0; i < this.patientAttributeValueVector.size(); i++ )
+            for ( int i = 0; i < patientAttributeValueVector.size(); i++ )
             {
                 String value = null;
-                Component field = (Component) this.patientAttributeValueVector.elementAt( i );
+                Component field = (Component) patientAttributeValueVector.elementAt( i );
 
-                if ( this.patientAttributeValueVector.elementAt( i ) instanceof TextField )
+                if ( patientAttributeValueVector.elementAt( i ) instanceof TextField )
                 {
-                    TextField textField = (TextField) this.patientAttributeValueVector.elementAt( i );
+                    TextField textField = (TextField) patientAttributeValueVector.elementAt( i );
                     value = textField.getText();
                 }
                 else
                 {
-                    ComboBox comboBox = (ComboBox) this.patientAttributeValueVector.elementAt( i );
+                    ComboBox comboBox = (ComboBox) patientAttributeValueVector.elementAt( i );
                     value = (String) comboBox.getSelectedItem();
                     if ( value.equalsIgnoreCase( "Yes" ) )
                     {
@@ -756,9 +585,7 @@
                 patientAttribute.setType( "" );
                 patientAttribute.setPredefinedValues( new Vector() );
                 // patientAttributeValueVector.setElementAt( patientAttribute, i
-                // );
-                System.out.println( "Att: " + name );
-                System.out.println( "Value: " + value );
+                // ););
                 attributeVector.addElement( patientAttribute );
             }
         }
@@ -770,10 +597,10 @@
 
         try
         {
-            for ( int i = 0; i < this.patientIdentifierValueVector.size(); i++ )
+            for ( int i = 0; i < patientIdentifierValueVector.size(); i++ )
             {
-                String rqId = "" + this.requiredIdentifierVector.elementAt( i );
-                TextField field = (TextField) this.patientIdentifierValueVector.elementAt( i );
+                String rqId = "" + requiredIdentifierVector.elementAt( i );
+                TextField field = (TextField) patientIdentifierValueVector.elementAt( i );
                 int endIndex = field.getLabelForComponent().getText().indexOf( "(" );
                 String typeName = "";
                 if ( rqId.equals( ")" ) )
@@ -811,11 +638,6 @@
         return requiredLabel;
     }
 
-    public void setRequiredLabel( Label requiredLabel )
-    {
-        this.requiredLabel = requiredLabel;
-    }
-
     public Label getDobWrongFortmatLabel()
     {
         if ( dobWrongFortmatLabel == null )
@@ -826,23 +648,6 @@
         return dobWrongFortmatLabel;
     }
 
-    public void setDobWrongFortmatLabel( Label dobWrongFortmatLabel )
-    {
-        this.dobWrongFortmatLabel = dobWrongFortmatLabel;
-    }
-
-    private SaveUnregisteredPersonTask saveUnregisteredPersonTask;
-
-    public SaveUnregisteredPersonTask getSaveUnregisteredPersonTask()
-    {
-        return saveUnregisteredPersonTask;
-    }
-
-    public void setSaveUnregisteredPersonTask( SaveUnregisteredPersonTask saveUnregisteredPersonTask )
-    {
-        this.saveUnregisteredPersonTask = saveUnregisteredPersonTask;
-    }
-
     public Vector getRequiredIdentifierVector()
     {
         return requiredIdentifierVector;
@@ -893,10 +698,6 @@
         this.enrollProgramId = enrollProgramId;
     }
 
-    private Vector offlinePatientAttributeVector;
-
-    private Vector offlinePatientIdentifierVector;
-
     public Vector getOfflinePatientAttributeVector()
     {
         if ( offlinePatientAttributeVector == null )
@@ -1027,4 +828,204 @@
     {
         this.txtIncidentDate = txtIncidentDate;
     }
+    
+    public Label getFullNameLabel()
+    {
+        return fullNameLabel;
+    }
+
+    public void setFullNameLabel( Label fullNameLabel )
+    {
+        this.fullNameLabel = fullNameLabel;
+    }
+
+    public Label getGenderLabel()
+    {
+        return genderLabel;
+    }
+
+    public void setGenderLabel( Label genderLabel )
+    {
+        this.genderLabel = genderLabel;
+    }
+
+    public Label getDateOfBirthLabel()
+    {
+        return dateOfBirthLabel;
+    }
+
+    public void setDateOfBirthLabel( Label dateOfBirthLabel )
+    {
+        this.dateOfBirthLabel = dateOfBirthLabel;
+    }
+
+    public Label getPhoneNumberLabel()
+    {
+        return phoneNumberLabel;
+    }
+
+    public void setPhoneNumberLabel( Label phoneNumberLabel )
+    {
+        this.phoneNumberLabel = phoneNumberLabel;
+    }
+
+    public TextField getFullNameTextField()
+    {
+        if ( fullNameTextField == null )
+        {
+            fullNameTextField = new TextField();
+        }
+        return fullNameTextField;
+    }
+
+    public void setFullNameTextField( TextField fullNameTextField )
+    {
+        this.fullNameTextField = fullNameTextField;
+    }
+
+    public ComboBox getGenderComboBox()
+    {
+        return genderComboBox;
+    }
+
+    public void setGenderComboBox( ComboBox genderComboBox )
+    {
+        this.genderComboBox = genderComboBox;
+    }
+
+    public ComboBox getDateOfBirthComboBox()
+    {
+        return dateOfBirthComboBox;
+    }
+
+    public void setDateOfBirthComboBox( ComboBox dateOfBirthComboBox )
+    {
+        this.dateOfBirthComboBox = dateOfBirthComboBox;
+    }
+
+    public TextField getPhoneNumberTextField()
+    {
+        if ( phoneNumberTextField == null )
+        {
+            phoneNumberTextField = new TextField();
+            phoneNumberTextField.setConstraint( TextField.NUMERIC );
+            phoneNumberTextField.setInputModeOrder( new String[] { "123" } );
+        }
+        return phoneNumberTextField;
+    }
+
+    public void setPhoneNumberTextField( TextField phoneNumberTextField )
+    {
+        this.phoneNumberTextField = phoneNumberTextField;
+    }
+
+    public Command getPersonRegistrationBackCommand()
+    {
+        if ( personRegistrationBackCommand == null )
+        {
+            personRegistrationBackCommand = new Command( Text.BACK() );
+        }
+        return personRegistrationBackCommand;
+    }
+
+    public void setPersonRegistrationBackCommand( Command personRegistrationBackCommand )
+    {
+        this.personRegistrationBackCommand = personRegistrationBackCommand;
+    }
+
+    public Command getPeronRegistrationSendCommand()
+    {
+        if ( personRegistrationSendCommand == null )
+        {
+            personRegistrationSendCommand = new Command( Text.SEND() );
+        }
+        return personRegistrationSendCommand;
+    }
+
+    public void setPeronRegistrationSendCommand( Command peronRegistrationSendCommand )
+    {
+        this.personRegistrationSendCommand = peronRegistrationSendCommand;
+    }
+
+    public Command getPersonRegistrationSaveCommand()
+    {
+        if ( personRegistrationSaveCommand == null )
+        {
+            personRegistrationSaveCommand = new Command( Text.SAVE() );
+        }
+        return personRegistrationSaveCommand;
+    }
+
+    public void setPersonRegistrationSaveCommand( Command personRegistrationSaveCommand )
+    {
+        this.personRegistrationSaveCommand = personRegistrationSaveCommand;
+    }
+
+    public TextField getDateOfBirthTextFiled()
+    {
+        return dateOfBirthTextFiled;
+    }
+
+    public void setDateOfBirthTextFiled( TextField dateOfBirthTextFiled )
+    {
+        this.dateOfBirthTextFiled = dateOfBirthTextFiled;
+    }
+
+    public ConnectionManager getConnectionManager()
+    {
+        return connectionManager;
+    }
+
+    public void setConnectionManager( ConnectionManager connectionManager )
+    {
+        this.connectionManager = connectionManager;
+    }
+
+    public Label getPatientIdentifierLabel()
+    {
+        return patientIdentifierLabel;
+    }
+
+    public void setPatientIdentifierLabel( Label patientIdentifierLabel )
+    {
+        this.patientIdentifierLabel = patientIdentifierLabel;
+    }
+
+    public Label getPatientAttributeLabel()
+    {
+        return patientAttributeLabel;
+    }
+
+    public void setPatientAttributeLabel( Label patientAttributeLabel )
+    {
+        this.patientAttributeLabel = patientAttributeLabel;
+    }
+
+    public TextField getPatientIdentifierTextField()
+    {
+        if ( patientIdentifierTextField == null )
+        {
+            patientIdentifierTextField = new TextField();
+        }
+        return patientIdentifierTextField;
+    }
+
+    public void setPatientIdentifierTextField( TextField patientIdentifierTextField )
+    {
+        this.patientIdentifierTextField = patientIdentifierTextField;
+    }
+
+    public TextField getPatientAttributeTextField()
+    {
+        if ( patientAttributeTextField == null )
+        {
+            patientAttributeTextField = new TextField();
+        }
+        return patientAttributeTextField;
+    }
+
+    public void setPatientAttributeTextField( TextField patientAttributeTextField )
+    {
+        this.patientAttributeTextField = patientAttributeTextField;
+    }
 }
\ No newline at end of file