dhis-mobile-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 209
committer: Long <long.hispvietnam@xxxxxxxxx>
branch nick: lwuit-tracking
timestamp: Fri 2014-04-25 15:57:16 +0700
message:
  support class for SEWR
added:
  src/org/hisp/dhis/mobile/connection/task/UploadSingleEventWithoutRegistration.java
modified:
  src/org/hisp/dhis/mobile/connection/ConnectionManager.java
  src/org/hisp/dhis/mobile/model/OrgUnit.java
  src/org/hisp/dhis/mobile/view/TrackingDataEntryView.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	2014-04-03 01:58:41 +0000
+++ src/org/hisp/dhis/mobile/connection/ConnectionManager.java	2014-04-25 08:57:16 +0000
@@ -44,6 +44,7 @@
 import org.hisp.dhis.mobile.connection.task.SendLostToFollowUpTask;
 import org.hisp.dhis.mobile.connection.task.UpdateContactTask;
 import org.hisp.dhis.mobile.connection.task.UpdateNewVersionTask;
+import org.hisp.dhis.mobile.connection.task.UploadSingleEventWithoutRegistration;
 import org.hisp.dhis.mobile.connection.task.UploadTrackingFormTask;
 import org.hisp.dhis.mobile.log.LogMan;
 import org.hisp.dhis.mobile.midlet.DHISMIDlet;
@@ -287,6 +288,12 @@
         GenerateRepeatableEventTask generateRepeatableEventTask = new GenerateRepeatableEventTask( eventInfo );
         runTask( generateRepeatableEventTask );
     }
+    
+    public static void uploadSingleEventWithoutRegistration(ProgramStage programStage) {
+        UploadSingleEventWithoutRegistration uploadSingleEventWithoutRegistration = new UploadSingleEventWithoutRegistration();
+        uploadSingleEventWithoutRegistration.setProgramStage( programStage );
+        runTask( uploadSingleEventWithoutRegistration );
+    }
 
     public static void runTask( AbstractTask task )
     {

=== added file 'src/org/hisp/dhis/mobile/connection/task/UploadSingleEventWithoutRegistration.java'
--- src/org/hisp/dhis/mobile/connection/task/UploadSingleEventWithoutRegistration.java	1970-01-01 00:00:00 +0000
+++ src/org/hisp/dhis/mobile/connection/task/UploadSingleEventWithoutRegistration.java	2014-04-25 08:57:16 +0000
@@ -0,0 +1,52 @@
+package org.hisp.dhis.mobile.connection.task;
+
+import java.io.DataInputStream;
+import java.io.IOException;
+
+import org.hisp.dhis.mobile.connection.ConnectionManager;
+import org.hisp.dhis.mobile.midlet.NameBasedMIDlet;
+import org.hisp.dhis.mobile.model.ProgramStage;
+import org.hisp.dhis.mobile.ui.Text;
+import org.hisp.dhis.mobile.util.SerializationUtil;
+
+public class UploadSingleEventWithoutRegistration extends AbstractTask
+{
+    
+    private static final String SINGLE_EVENT_WITHOUT_REGISTRATION_UPLOADED = "single_event_without_registration_uploaded";
+    
+    private ProgramStage programStage;
+
+    public void run()
+    {
+        NameBasedMIDlet nameBasedMIDlet = (NameBasedMIDlet) ConnectionManager.getDhisMIDlet();
+        DataInputStream messageStream;
+        try
+        {
+            messageStream = this.upload( SerializationUtil.serialize( programStage ) );
+            String message = this.readMessage( messageStream );
+            if ( message.startsWith( SINGLE_EVENT_WITHOUT_REGISTRATION_UPLOADED ) )
+            {
+                nameBasedMIDlet.getAlertBoxView( programStage.getName(), Text.UPLOAD_COMPLETED() ).showView();
+                nameBasedMIDlet.getTrackingMainMenuView().showView();
+            }
+        }
+        catch ( IOException e )
+        {
+            e.printStackTrace();
+        }
+       
+    }
+
+    public ProgramStage getProgramStage()
+    {
+        return programStage;
+    }
+
+    public void setProgramStage( ProgramStage programStage )
+    {
+        this.programStage = programStage;
+    }
+    
+    
+
+}

=== modified file 'src/org/hisp/dhis/mobile/model/OrgUnit.java'
--- src/org/hisp/dhis/mobile/model/OrgUnit.java	2014-03-26 04:24:35 +0000
+++ src/org/hisp/dhis/mobile/model/OrgUnit.java	2014-04-25 08:57:16 +0000
@@ -78,6 +78,8 @@
     private String handleLostToFollowUpUrl;
 
     private String generateRepeatableEventUrl;
+    
+    private String uploadSingleEventWithoutRegistration;
 
     public static double serverVersion;
 
@@ -211,6 +213,16 @@
         return generateRepeatableEventUrl;
     }
 
+    public String getUploadSingleEventWithoutRegistration()
+    {
+        return uploadSingleEventWithoutRegistration;
+    }
+
+    public void setUploadSingleEventWithoutRegistration( String uploadSingleEventWithoutRegistration )
+    {
+        this.uploadSingleEventWithoutRegistration = uploadSingleEventWithoutRegistration;
+    }
+
     public void serialize( DataOutputStream dataOutputStream )
         throws IOException
     {
@@ -238,6 +250,7 @@
         dataOutputStream.writeUTF( findLostToFollowUpUrl );
         dataOutputStream.writeUTF( handleLostToFollowUpUrl );
         dataOutputStream.writeUTF( generateRepeatableEventUrl );
+        dataOutputStream.writeUTF( uploadSingleEventWithoutRegistration );
     }
 
     public void deSerialize( DataInputStream dataInputStream )
@@ -316,6 +329,8 @@
 
         generateRepeatableEventUrl = dataInputStream.readUTF();
         LogMan.log( LogMan.DEBUG, "OrgUnit," + CLASS_TAG, "generateRepeatableEventUrl=" + generateRepeatableEventUrl );
+        
+        uploadSingleEventWithoutRegistration = dataInputStream.readUTF();
     }
 
     public boolean checkNewVersion( double serverVersion )

=== modified file 'src/org/hisp/dhis/mobile/view/TrackingDataEntryView.java'
--- src/org/hisp/dhis/mobile/view/TrackingDataEntryView.java	2014-04-03 09:53:18 +0000
+++ src/org/hisp/dhis/mobile/view/TrackingDataEntryView.java	2014-04-25 08:57:16 +0000
@@ -145,7 +145,7 @@
 
             if ( !programStage.getReportDate().equals( "" ) )
             {
-                reportDateField.setText( programStage.getReportDate());
+                reportDateField.setText( programStage.getReportDate() );
             }
             else
             {
@@ -243,9 +243,13 @@
                 ConnectionManager.setUrl( namebasedMidlet.getCurrentOrgUnit().getUploadProgramStageUrl() + "/0" );
             }
 
-            if ( programStage.isSingleEvent() )
+            if ( programStage.isSingleEvent() && patient == null )
             {
-                ConnectionManager.uploadProgramStage( programStage, null, null, uploadProgramStage );
+                ConnectionManager
+                    .setUrl( namebasedMidlet.getCurrentOrgUnit().getUploadSingleEventWithoutRegistration() );
+                ConnectionManager.uploadSingleEventWithoutRegistration( uploadProgramStage );
+                // ConnectionManager.uploadProgramStage( programStage, null,
+                // null, uploadProgramStage );
             }
             else
             {