dhis-mobile-devs team mailing list archive
-
dhis-mobile-devs team
-
Mailing list archive
-
Message #00353
[Branch ~dhis-mobile-devs/dhis-mobile/lwuit-tracking] Rev 195: minor fix
------------------------------------------------------------
revno: 195
committer: Long <Long@Long-Laptop>
branch nick: lwuit-tracking
timestamp: Thu 2014-02-13 11:04:29 +0700
message:
minor fix
modified:
build.xml
src/org/hisp/dhis/mobile/view/PersonDashboardView.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 'build.xml'
--- build.xml 2014-02-07 11:02:56 +0000
+++ build.xml 2014-02-13 04:04:29 +0000
@@ -34,7 +34,7 @@
<!-- Which logo to use -->
<property name="logo" value="dhis2_logo.png" />
<!-- Server URL -->
- <property name="server.url" value="http://apps.dhis2.org.dev"; />
+ <property name="server.url" value="http://apps.dhis2.org/dev"; />
<!-- User Name -->
<property name="username" value="mobile" />
<!-- Password -->
=== modified file 'src/org/hisp/dhis/mobile/view/PersonDashboardView.java'
--- src/org/hisp/dhis/mobile/view/PersonDashboardView.java 2014-02-07 11:02:56 +0000
+++ src/org/hisp/dhis/mobile/view/PersonDashboardView.java 2014-02-13 04:04:29 +0000
@@ -233,7 +233,7 @@
{
for ( int i = 0; i < programs.size(); i++ )
{
- ProgramInstance programInstance = (ProgramInstance) programs.elementAt( i );
+ final ProgramInstance programInstance = (ProgramInstance) programs.elementAt( i );
if ( programInstance.getProgramStageInstances().size() > 1 )
{
@@ -244,6 +244,7 @@
public void actionPerformed( ActionEvent ae )
{
namebasedMidlet.getProgramStageListView().setPatient( patient );
+ namebasedMidlet.getProgramStageListView().setProgramInstance( programInstance );
namebasedMidlet.getProgramStageListView().showView();
}
} );
@@ -318,7 +319,6 @@
mainForm.addComponent( programStageLink );
}
}
- programInstance = null;
System.gc();
}
}
=== modified file 'src/org/hisp/dhis/mobile/view/ProgramStageListView.java'
--- src/org/hisp/dhis/mobile/view/ProgramStageListView.java 2014-02-07 11:02:56 +0000
+++ src/org/hisp/dhis/mobile/view/ProgramStageListView.java 2014-02-13 04:04:29 +0000
@@ -1,7 +1,6 @@
package org.hisp.dhis.mobile.view;
import java.io.IOException;
-import java.util.Vector;
import org.hisp.dhis.mobile.midlet.DHISMIDlet;
import org.hisp.dhis.mobile.midlet.NameBasedMIDlet;
@@ -38,6 +37,8 @@
private Program program;
+ private ProgramInstance programInstance;
+
public ProgramStageListView( DHISMIDlet dhisMIDlet )
{
super( dhisMIDlet );
@@ -59,67 +60,56 @@
public void prepareProgramStageList()
{
- Vector programInstances = patient.getEnrollmentPrograms();
- if ( programInstances != null )
+ for ( int j = 0; j < programInstance.getProgramStageInstances().size(); j++ )
{
- for ( int i = 0; i < programInstances.size(); i++ )
+ final ProgramStage programStage = (ProgramStage) programInstance.getProgramStageInstances().elementAt( j );
+ if ( programStage.isSingleEvent() == false )
{
- ProgramInstance programInstance = (ProgramInstance) programInstances.elementAt( i );
- for ( int j = 0; j < programInstance.getProgramStageInstances().size(); j++ )
- {
- final ProgramStage programStage = (ProgramStage) programInstance.getProgramStageInstances()
- .elementAt( j );
- if ( programStage.isSingleEvent() == false )
- {
- LinkButton programStageLink = new LinkButton( programStage.getName() );
- if ( programStage.isCompleted() )
+ LinkButton programStageLink = new LinkButton( programStage.getName() );
+ if ( programStage.isCompleted() )
+ {
+ try
+ {
+ Image image = Image.createImage( "/sent.gif" );
+ Label sentLabel = new Label( image );
+
+ Container c = new Container( new GridLayout( 1, 2 ) );
+ c.addComponent( programStageLink );
+ c.addComponent( sentLabel );
+ personProgramStageListForm.addComponent( c );
+ }
+ catch ( IOException e )
+ {
+ e.printStackTrace();
+ }
+ }
+ else
+ {
+ personProgramStageListForm.addComponent( programStageLink );
+ }
+ programStageLink.addActionListener( new ActionListener()
+ {
+
+ public void actionPerformed( ActionEvent arg0 )
+ {
+ if ( programStage.getSections().size() > 0 )
{
- try
- {
- Image image = Image.createImage( "/sent.gif" );
- Label sentLabel = new Label( image );
-
- Container c = new Container( new GridLayout( 1, 2 ) );
- c.addComponent( programStageLink );
- c.addComponent( sentLabel );
- personProgramStageListForm.addComponent( c );
- }
- catch ( IOException e )
- {
- e.printStackTrace();
- }
+ nameBasedMIDlet.getSectionListView().setPatient( patient );
+ nameBasedMIDlet.getSectionListView().setProgramStage( programStage );
+ nameBasedMIDlet.getSectionListView().showView();
}
else
{
- personProgramStageListForm.addComponent( programStageLink );
+ nameBasedMIDlet.getTrackingDataEntryView().setPatient( patient );
+ nameBasedMIDlet.getTrackingDataEntryView().setProgramStage( programStage );
+ nameBasedMIDlet.getTrackingDataEntryView().setTitle( programStage.getName() );
+ nameBasedMIDlet.getTrackingDataEntryView().showView();
}
- programStageLink.addActionListener( new ActionListener()
- {
-
- public void actionPerformed( ActionEvent arg0 )
- {
- if ( programStage.getSections().size() > 0 )
- {
- nameBasedMIDlet.getSectionListView().setPatient( patient );
- nameBasedMIDlet.getSectionListView().setProgramStage( programStage );
- nameBasedMIDlet.getSectionListView().showView();
- }
- else
- {
- nameBasedMIDlet.getTrackingDataEntryView().setPatient( patient );
- nameBasedMIDlet.getTrackingDataEntryView().setProgramStage( programStage );
- nameBasedMIDlet.getTrackingDataEntryView().setTitle( programStage.getName() );
- nameBasedMIDlet.getTrackingDataEntryView().showView();
- }
-
- }
- } );
+
}
- }
-
+ } );
}
}
- programInstances = null;
System.gc();
}
@@ -198,4 +188,14 @@
this.program = program;
}
+ public ProgramInstance getProgramInstance()
+ {
+ return programInstance;
+ }
+
+ public void setProgramInstance( ProgramInstance programInstance )
+ {
+ this.programInstance = programInstance;
+ }
+
}
