dhis-mobile-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 142
committer: Long <Long@Long-Laptop>
branch nick: lwuit-tracking
timestamp: Tue 2013-09-10 15:17:24 +0700
message:
  minor fix
modified:
  src/org/hisp/dhis/mobile/connection/ConnectionManager.java
  src/org/hisp/dhis/mobile/connection/task/PersonRegistrationTask.java
  src/org/hisp/dhis/mobile/view/PersonRegistrationView.java
  src/org/hisp/dhis/mobile/view/RegistrationProgramSelectionView.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-09-07 13:31:02 +0000
+++ src/org/hisp/dhis/mobile/connection/ConnectionManager.java	2013-09-10 08:17:24 +0000
@@ -294,9 +294,9 @@
         return MEDIATYPE_MOBILE_SERIALIZED;
     }
 
-    public static void registerPerson( Patient patient )
+    public static void registerPerson( Patient patient, String enrollProgramId )
     {
-        PersonRegistrationTask registerTask = new PersonRegistrationTask( patient );
+        PersonRegistrationTask registerTask = new PersonRegistrationTask( patient, enrollProgramId );
         runTask( registerTask );
     }
 

=== modified file 'src/org/hisp/dhis/mobile/connection/task/PersonRegistrationTask.java'
--- src/org/hisp/dhis/mobile/connection/task/PersonRegistrationTask.java	2013-09-10 07:17:17 +0000
+++ src/org/hisp/dhis/mobile/connection/task/PersonRegistrationTask.java	2013-09-10 08:17:24 +0000
@@ -15,13 +15,16 @@
 
     private Patient patient;
 
-    NameBasedMIDlet nameBasedMIDlet;
-
-    FindLatestPersonTask findLatestPersonTask;
-
-    public PersonRegistrationTask( Patient patient )
+    private NameBasedMIDlet nameBasedMIDlet;
+
+    private FindLatestPersonTask findLatestPersonTask;
+
+    private String enrollProgramId;
+
+    public PersonRegistrationTask( Patient patient, String enrollProgramId )
     {
         this.patient = patient;
+        this.enrollProgramId = enrollProgramId;
     }
 
     public void run()
@@ -34,7 +37,6 @@
             String message = this.readMessage( messageStream );
             if ( message.equalsIgnoreCase( PATIENT_REGISTERED ) )
             {
-
                 nameBasedMIDlet.getWaitingView().showView();
                 nameBasedMIDlet.getDashboardLinkView().showView();
             }

=== modified file 'src/org/hisp/dhis/mobile/view/PersonRegistrationView.java'
--- src/org/hisp/dhis/mobile/view/PersonRegistrationView.java	2013-09-10 07:17:17 +0000
+++ src/org/hisp/dhis/mobile/view/PersonRegistrationView.java	2013-09-10 08:17:24 +0000
@@ -100,6 +100,8 @@
     private Vector requiredIdentifierVector = new Vector();
 
     private Vector requireAttributeVector = new Vector();
+    
+    private String enrollProgramId = "";
 
     public Vector getRequiredIdentifierVector()
     {
@@ -140,6 +142,18 @@
     {
         this.patientAttributeValueVector = patientAttributeValueVector;
     }
+    
+    public String getEnrollProgramId()
+    {
+        return enrollProgramId;
+    }
+
+    public void setEnrollProgramId( String enrollProgramId )
+    {
+        this.enrollProgramId = enrollProgramId;
+    }
+
+
 
     private Vector offlinePatientAttributeVector;
 
@@ -855,7 +869,7 @@
             {
                 nameBasedMIDlet.getWaitingView().showView();
                 ConnectionManager.setUrl( dhisMIDlet.getCurrentOrgUnit().getRegisterPersonUrl() );
-                ConnectionManager.registerPerson( patient );
+                ConnectionManager.registerPerson( patient, this.enrollProgramId );
                 try
                 {
                     PatientIdentifierRecordStore.deleteRecordStore();

=== modified file 'src/org/hisp/dhis/mobile/view/RegistrationProgramSelectionView.java'
--- src/org/hisp/dhis/mobile/view/RegistrationProgramSelectionView.java	2013-09-10 07:17:17 +0000
+++ src/org/hisp/dhis/mobile/view/RegistrationProgramSelectionView.java	2013-09-10 08:17:24 +0000
@@ -48,6 +48,7 @@
         if ( ae.getSource() == this.getProgramList() )
         {
             Program selectedProgram = (Program) programVector.elementAt( this.getProgramList().getSelectedIndex() );
+            nameBasedMIDlet.getPersonRegistrationView().setEnrollProgramId( String.valueOf( selectedProgram.getId() ) );
             try
             {
                 Vector orgUnitVector = OrgUnitRecordStore.loadAllOrgUnit();
@@ -62,6 +63,8 @@
                 else
                 {
                     ConnectionManager.setUrl( nameBasedMIDlet.getCurrentOrgUnit().getGetVariesInfoUrl() );
+                    nameBasedMIDlet.getPersonRegistrationView().prepareView();
+                    nameBasedMIDlet.getPersonRegistrationView().showView();
                 }
 
             }
@@ -78,27 +81,26 @@
 
     public void prepareView()
     {
-        programVector = null;
-        programList = null;
-        try
-        {
-            programVector = ProgramRecordStore.getAllProgram();
-        }
-        catch ( Exception e )
-        {
-            e.printStackTrace();
-        }
-
-        for ( int i = 0; i < programVector.size(); i++ )
-        {
-            Program program = (Program) programVector.elementAt( i );
-            ProgramStage firstStage = (ProgramStage) program.getProgramStages().elementAt( 0 );
-
-            if ( !firstStage.isSingleEvent() )
-            {
-                this.getProgramList().addItem( program.getName() );
-            }
-        }
+//        programList = null;
+//        try
+//        {
+//            programVector = ProgramRecordStore.getAllProgram();
+//        }
+//        catch ( Exception e )
+//        {
+//            e.printStackTrace();
+//        }
+//
+//        for ( int i = 0; i < programVector.size(); i++ )
+//        {
+//            Program program = (Program) programVector.elementAt( i );
+//            ProgramStage firstStage = (ProgramStage) program.getProgramStages().elementAt( 0 );
+//
+//            if ( !firstStage.isSingleEvent() )
+//            {
+//                this.getProgramList().addItem( program.getName() );
+//            }
+//        }
     }
 
     public void showView()
@@ -115,6 +117,26 @@
             programList.setSmoothScrolling( true );
             programList.setFixedSelection( List.FIXED_NONE );
             programList.addActionListener( this );
+            
+            try
+            {
+                programVector = ProgramRecordStore.getAllProgram();
+            }
+            catch ( Exception e )
+            {
+                e.printStackTrace();
+            }
+
+            for ( int i = 0; i < programVector.size(); i++ )
+            {
+                Program program = (Program) programVector.elementAt( i );
+                ProgramStage firstStage = (ProgramStage) program.getProgramStages().elementAt( 0 );
+
+                if ( !firstStage.isSingleEvent() )
+                {
+                    this.getProgramList().addItem( program.getName() );
+                }
+            }
         }
         return programList;
     }