dhis-mobile-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 247
committer: sherylyn.marie
branch nick: lwuit-tracking
timestamp: Tue 2014-11-18 00:14:23 +0800
message:
  Fixed CreateProgramStageView back button
modified:
  src/org/hisp/dhis/mobile/connection/task/UploadTrackingFormTask.java
  src/org/hisp/dhis/mobile/view/CreateProgramStageView.java
  src/org/hisp/dhis/mobile/view/ProgramStageListView.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/task/UploadTrackingFormTask.java'
--- src/org/hisp/dhis/mobile/connection/task/UploadTrackingFormTask.java	2014-06-24 03:59:44 +0000
+++ src/org/hisp/dhis/mobile/connection/task/UploadTrackingFormTask.java	2014-11-17 16:14:23 +0000
@@ -29,18 +29,15 @@
 import java.io.DataInputStream;
 import java.io.IOException;
 
-import javax.microedition.rms.RecordStoreException;
-import javax.microedition.rms.RecordStoreFullException;
-import javax.microedition.rms.RecordStoreNotFoundException;
-
 import org.hisp.dhis.mobile.connection.ConnectionManager;
 import org.hisp.dhis.mobile.log.LogMan;
-import org.hisp.dhis.mobile.midlet.DHISMIDlet;
 import org.hisp.dhis.mobile.midlet.NameBasedMIDlet;
 import org.hisp.dhis.mobile.model.Patient;
+import org.hisp.dhis.mobile.model.Program;
+import org.hisp.dhis.mobile.model.ProgramInstance;
 import org.hisp.dhis.mobile.model.ProgramStage;
 import org.hisp.dhis.mobile.model.Section;
-import org.hisp.dhis.mobile.recordstore.OfflinePatientRecordStore;
+import org.hisp.dhis.mobile.recordstore.ProgramRecordStore;
 import org.hisp.dhis.mobile.ui.Text;
 import org.hisp.dhis.mobile.util.SerializationUtil;
 
@@ -109,19 +106,33 @@
                 // }
                 // }
                 // }
-                
-                
+
                 nameBasedMIDlet.getTrackingDataEntryView().setSection( null );
-                if ( programStage.isRepeatable() )
+//                if ( programStage.isRepeatable() )
+//                {
+//                    String nextDate = message.substring( message.indexOf( "$" ) + 1, message.length() );
+//                    nameBasedMIDlet.getGenerateRepeatableEventView( programStage, nextDate, patient ).showView();
+//                }
+//                else
+//                {
+//                    nameBasedMIDlet.getPersonDashboardView().setPatient( patient );
+//                    nameBasedMIDlet.getAlertBoxView( programStage.getName(), Text.UPLOAD_COMPLETED() ).showView();
+//                    nameBasedMIDlet.getPersonDashboardView().showView();
+//                }
+
+                try
                 {
-                    String nextDate = message.substring( message.indexOf( "$" ) + 1, message.length() );
-                    nameBasedMIDlet.getGenerateRepeatableEventView( programStage, nextDate, patient ).showView();
+                    ProgramInstance currentProgram = (ProgramInstance) patient.getEnrollmentPrograms().elementAt( 0 );
+                    
+                    nameBasedMIDlet.getCreateProgramStageView().setPatient( patient );
+                    nameBasedMIDlet.getCreateProgramStageView().setProgram(
+                        ProgramRecordStore.getProgram( currentProgram.getProgramId() ) );
+                    nameBasedMIDlet.getCreateProgramStageView().setProgramInstance( currentProgram );
+                    nameBasedMIDlet.getCreateProgramStageView().showView();
                 }
-                else
+                catch ( Exception e )
                 {
-                    nameBasedMIDlet.getPersonDashboardView().setPatient( patient );
-                    nameBasedMIDlet.getAlertBoxView( programStage.getName(), Text.UPLOAD_COMPLETED() ).showView();
-                    nameBasedMIDlet.getPersonDashboardView().showView();
+                    e.printStackTrace();
                 }
             }
             else if ( message.equalsIgnoreCase( PROGRAM_STAGE_SECTION_UPLOADED ) )
@@ -146,7 +157,6 @@
                 nameBasedMIDlet.getTrackingMainMenuView().showView();
             }
 
-
             patient = null;
             programStage = null;
             uploadProgramStage = null;

=== modified file 'src/org/hisp/dhis/mobile/view/CreateProgramStageView.java'
--- src/org/hisp/dhis/mobile/view/CreateProgramStageView.java	2014-11-05 14:25:26 +0000
+++ src/org/hisp/dhis/mobile/view/CreateProgramStageView.java	2014-11-17 16:14:23 +0000
@@ -5,6 +5,7 @@
 import org.hisp.dhis.mobile.connection.ConnectionManager;
 import org.hisp.dhis.mobile.midlet.DHISMIDlet;
 import org.hisp.dhis.mobile.midlet.NameBasedMIDlet;
+import org.hisp.dhis.mobile.model.Patient;
 import org.hisp.dhis.mobile.model.Program;
 import org.hisp.dhis.mobile.model.ProgramInstance;
 import org.hisp.dhis.mobile.model.ProgramStage;
@@ -42,6 +43,8 @@
 
     private Label lblWrongFormat;
 
+    private Patient patient;
+
     public CreateProgramStageView( DHISMIDlet dhisMIDlet )
     {
         super( dhisMIDlet );
@@ -127,9 +130,9 @@
     {
         if ( ae.getCommand().getCommandName().equals( "Back" ) )
         {
-            nameBasedMIDlet.getVisitScheduleMenuView().setProgram( program );
-            nameBasedMIDlet.getVisitScheduleMenuView().showView();
-
+            nameBasedMIDlet.getPersonDashboardView().setPatient( patient );
+            nameBasedMIDlet.getPersonDashboardView().showView();
+            
             programStages.removeAllElements();
             createProgramStageForm = null;
             programStages = null;
@@ -155,9 +158,8 @@
                 nameBasedMIDlet.getWaitingView().showView();
                 ProgramStage programStage = (ProgramStage) programStages.elementAt( programStageOptions
                     .getSelectedIndex() );
-                System.out.println( "SHERIE ****************************** generateRepeatableEvent :: "
-                    + programStage.getName() + " :: " + programStage.getId() + "$" + dueDate );
-                ConnectionManager.generateRepeatableEvent( getProgramStageInstance(programStage.getName()).getId() + "$" + dueDate );
+                ConnectionManager.generateRepeatableEvent( getProgramStageInstance( programStage.getName() ).getId()
+                    + "$" + dueDate );
 
                 programStages.removeAllElements();
                 createProgramStageForm = null;
@@ -167,6 +169,7 @@
                 lblWrongFormat = null;
                 program = null;
                 programInstance = null;
+                patient = null;
                 System.gc();
             }
         }
@@ -224,4 +227,9 @@
         return this.programInstance;
     }
 
+    public void setPatient( Patient patient )
+    {
+        this.patient = patient;
+    }
+
 }

=== modified file 'src/org/hisp/dhis/mobile/view/ProgramStageListView.java'
--- src/org/hisp/dhis/mobile/view/ProgramStageListView.java	2014-11-03 02:28:04 +0000
+++ src/org/hisp/dhis/mobile/view/ProgramStageListView.java	2014-11-17 16:14:23 +0000
@@ -176,6 +176,7 @@
         {
             try
             {
+                nameBasedMIDlet.getCreateProgramStageView().setPatient( patient );
                 nameBasedMIDlet.getCreateProgramStageView().setProgram(
                     ProgramRecordStore.getProgram( programInstance.getProgramId() ) );
                 nameBasedMIDlet.getCreateProgramStageView().setProgramInstance( programInstance );