← Back to team overview

dhis-mobile-devs team mailing list archive

[Branch ~dhis-mobile-devs/dhis-mobile/lwuit-tracking] Rev 207: improve workflow for SEWR

 

------------------------------------------------------------
revno: 207
committer: Long <long.hispvietnam@xxxxxxxxx>
branch nick: lwuit-tracking
timestamp: Tue 2014-04-22 13:55:18 +0700
message:
  improve workflow for SEWR
modified:
  src/org/hisp/dhis/mobile/view/ProgramSelectView.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/ProgramSelectView.java'
--- src/org/hisp/dhis/mobile/view/ProgramSelectView.java	2014-04-03 01:58:41 +0000
+++ src/org/hisp/dhis/mobile/view/ProgramSelectView.java	2014-04-22 06:55:18 +0000
@@ -8,6 +8,7 @@
 import org.hisp.dhis.mobile.midlet.NameBasedMIDlet;
 import org.hisp.dhis.mobile.model.LinkButton;
 import org.hisp.dhis.mobile.model.Program;
+import org.hisp.dhis.mobile.model.ProgramStage;
 import org.hisp.dhis.mobile.ui.Text;
 
 import com.sun.lwuit.CheckBox;
@@ -26,6 +27,7 @@
     implements ActionListener
 {
     private static final String CLASS_TAG = "ProgramSelectView";
+
     private Form mainForm;
 
     private Vector programs;
@@ -100,11 +102,19 @@
                     {
                         if ( !isLostToFollowUp )
                         {
-
-                            ConnectionManager.setUrl( nameBasedMIDlet.getCurrentOrgUnit().getGetVariesInfoUrl() );
-                            nameBasedMIDlet.getPersonRegistrationView().setProgram( program );
-                            nameBasedMIDlet.getPersonRegistrationView().prepareView();
-                            nameBasedMIDlet.getPersonRegistrationView().showView();
+                            if ( program.getType() != 3 )
+                            {
+                                ConnectionManager.setUrl( nameBasedMIDlet.getCurrentOrgUnit().getGetVariesInfoUrl() );
+                                nameBasedMIDlet.getPersonRegistrationView().setProgram( program );
+                                nameBasedMIDlet.getPersonRegistrationView().prepareView();
+                                nameBasedMIDlet.getPersonRegistrationView().showView();
+                            }
+                            else
+                            {
+                                nameBasedMIDlet.getTrackingDataEntryView().setProgramStage( (ProgramStage) program.getProgramStages().elementAt( 0 ) );
+                                nameBasedMIDlet.getTrackingDataEntryView().setTitle( program.getName() );
+                                nameBasedMIDlet.getTrackingDataEntryView().showView();
+                            }
 
                         }
                         else