dhis-mobile-devs team mailing list archive
-
dhis-mobile-devs team
-
Mailing list archive
-
Message #00283
[Branch ~dhis-mobile-devs/dhis-mobile/lwuit-tracking] Rev 144: change patient model, improve search patient method, hide/show current programs and completed pro...
------------------------------------------------------------
revno: 144
committer: Lai <lai.hispvietnam@xxxxxxxxx>
branch nick: lwuit-tracking
timestamp: Tue 2013-09-10 18:33:54 +0700
message:
change patient model, improve search patient method, hide/show current programs and completed program on person dashboard
modified:
build.properties
build.xml
res/properties/app.properties
src/org/hisp/dhis/mobile/model/Patient.java
src/org/hisp/dhis/mobile/view/NoMatchingView.java
src/org/hisp/dhis/mobile/view/PersonDashboardView.java
src/org/hisp/dhis/mobile/view/PersonListView.java
src/org/hisp/dhis/mobile/view/RegistrationProgramSelectionView.java
src/org/hisp/dhis/mobile/view/TrackingMainMenuView.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.properties'
--- build.properties 2013-09-08 12:38:35 +0000
+++ build.properties 2013-09-10 11:33:54 +0000
@@ -116,6 +116,7 @@
,src/org/hisp/dhis/mobile/view/PersonRegistrationView.java\
,src/org/hisp/dhis/mobile/view/PinView.java\
,src/org/hisp/dhis/mobile/view/ProgramStageListView.java\
+,src/org/hisp/dhis/mobile/view/RegistrationProgramSelectionView.java\
,src/org/hisp/dhis/mobile/view/SectionListView.java\
,src/org/hisp/dhis/mobile/view/SettingView.java\
,src/org/hisp/dhis/mobile/view/SplashScreen.java\
@@ -245,6 +246,7 @@
,src/org/hisp/dhis/mobile/view/PersonRegistrationView.java\
,src/org/hisp/dhis/mobile/view/PinView.java\
,src/org/hisp/dhis/mobile/view/ProgramStageListView.java\
+,src/org/hisp/dhis/mobile/view/RegistrationProgramSelectionView.java\
,src/org/hisp/dhis/mobile/view/SectionListView.java\
,src/org/hisp/dhis/mobile/view/SettingView.java\
,src/org/hisp/dhis/mobile/view/SplashScreen.java\
@@ -374,6 +376,7 @@
,src/org/hisp/dhis/mobile/view/PersonRegistrationView.java\
,src/org/hisp/dhis/mobile/view/PinView.java\
,src/org/hisp/dhis/mobile/view/ProgramStageListView.java\
+,src/org/hisp/dhis/mobile/view/RegistrationProgramSelectionView.java\
,src/org/hisp/dhis/mobile/view/SectionListView.java\
,src/org/hisp/dhis/mobile/view/SettingView.java\
,src/org/hisp/dhis/mobile/view/SplashScreen.java\
=== modified file 'build.xml'
--- build.xml 2013-09-10 07:17:17 +0000
+++ build.xml 2013-09-10 11:33:54 +0000
@@ -36,11 +36,11 @@
<!-- Server URL -->
<property name="server.url" value="http://localhost:9999"; />
<!-- User Name -->
- <property name="username" value="long" />
+ <property name="username" value="mobile" />
<!-- Password -->
- <property name="password" value="District1" />
+ <property name="password" value="district" />
<!-- Server Phone Number -->
- <property name="server.phonenumber" value="" />
+ <property name="server.phonenumber" value="+8494485878" />
<!-- Default Locale -->
<property name="default.locale" value="en-GB" />
<!-- Keystore Properties-->
=== modified file 'res/properties/app.properties'
--- res/properties/app.properties 2012-07-12 02:34:52 +0000
+++ res/properties/app.properties 2013-09-10 11:33:54 +0000
@@ -2,4 +2,6 @@
#Fri Nov 26 10:59:34 IST 2010
server.url=${server.url}
server.phonenumber=${server.phonenumber}
+username=${username}
+password=${password}
default.locale=${default.locale}
=== modified file 'src/org/hisp/dhis/mobile/model/Patient.java'
--- src/org/hisp/dhis/mobile/model/Patient.java 2013-09-10 07:17:17 +0000
+++ src/org/hisp/dhis/mobile/model/Patient.java 2013-09-10 11:33:54 +0000
@@ -33,7 +33,6 @@
public class Patient
implements DataStreamSerializable
{
-
private int id;
private String firstName, middleName, lastName;
@@ -65,6 +64,8 @@
private String phoneNumber;
private String organisationUnitName;
+
+ private Vector completedPrograms;
public Patient()
{
@@ -284,6 +285,16 @@
this.organisationUnitName = organisationUnitName;
}
+ public Vector getCompletedPrograms()
+ {
+ return completedPrograms;
+ }
+
+ public void setCompletedPrograms( Vector completedPrograms )
+ {
+ this.completedPrograms = completedPrograms;
+ }
+
public void deSerialize( DataInputStream din )
throws IOException
{
@@ -406,20 +417,13 @@
*/
}
this.setPrograms( programsVector );
+ programsVector = null;
}
else
{
this.setPrograms( null );
}
- /*
- * int numbPatientDataValue = din.readInt();
- *
- * for ( int i = 0; i < numbPatientDataValue; i++ ) { int dataElementID
- * = din.readInt(); System.out.println(dataElementID); String value =
- * din.readUTF(); System.out.println("value :"+value); }
- */
-
int numbRelationships = din.readInt();
if ( numbRelationships > 0 )
@@ -432,6 +436,7 @@
relationshipsVector.addElement( relationship );
}
this.setRelationships( relationshipsVector );
+ relationshipsVector = null;
}
else
{
@@ -450,6 +455,7 @@
enrollmentProgramsVector.addElement( program );
}
this.setEnrollmentPrograms( enrollmentProgramsVector );
+ enrollmentProgramsVector = null;
}
else
{
@@ -468,11 +474,31 @@
enrollmentRelationshipsVector.addElement( relationship );
}
this.setEnrollmentRelationships( enrollmentRelationshipsVector );
+ enrollmentRelationshipsVector = null;
}
else
{
this.setEnrollmentRelationships( null );
}
+
+ int numbCompletedPrograms = din.readInt();
+
+ if ( numbCompletedPrograms > 0 )
+ {
+ Vector completedProgramsVector = new Vector();
+ for ( int i = 0; i < numbCompletedPrograms; i++ )
+ {
+ Program program = new Program();
+ program.deSerialize( din );
+ completedProgramsVector.addElement( program );
+ }
+ this.setCompletedPrograms( completedProgramsVector );
+ completedProgramsVector = null;
+ }
+ else
+ {
+ this.setCompletedPrograms( null );
+ }
}
public void serialize( DataOutputStream dout )
=== modified file 'src/org/hisp/dhis/mobile/view/NoMatchingView.java'
--- src/org/hisp/dhis/mobile/view/NoMatchingView.java 2013-09-07 13:31:02 +0000
+++ src/org/hisp/dhis/mobile/view/NoMatchingView.java 2013-09-10 11:33:54 +0000
@@ -83,7 +83,9 @@
backCommand = null;
addPersonCommand = null;
System.gc();
- namebasedMidlet.getPersonRegistrationView().showView();
+ //namebasedMidlet.getPersonRegistrationView().showView();
+ namebasedMidlet.getRegistrationProgramSelectionView().prepareView();
+ namebasedMidlet.getRegistrationProgramSelectionView().showView();
}
}
=== modified file 'src/org/hisp/dhis/mobile/view/PersonDashboardView.java'
--- src/org/hisp/dhis/mobile/view/PersonDashboardView.java 2013-09-07 13:31:02 +0000
+++ src/org/hisp/dhis/mobile/view/PersonDashboardView.java 2013-09-10 11:33:54 +0000
@@ -127,32 +127,23 @@
labelStyle.setBgColor( 0xcccccc );
// show current programs
- Label currentProgramlbl = new Label( "Current Programs" );
- currentProgramlbl.setUnselectedStyle( labelStyle );
- currentProgramlbl.setSelectedStyle( labelStyle );
- mainForm.addComponent( currentProgramlbl );
- this.preparePrograms();
+ if ( patient.getPrograms() != null )
+ {
+ Label currentProgramlbl = new Label( "Current Programs" );
+ currentProgramlbl.setUnselectedStyle( labelStyle );
+ currentProgramlbl.setSelectedStyle( labelStyle );
+ mainForm.addComponent( currentProgramlbl );
+ this.preparePrograms();
+ }
// show completed programs
- Label completedProgramlbl = new Label( "Completed Programs" );
- completedProgramlbl.setUnselectedStyle( labelStyle );
- completedProgramlbl.setSelectedStyle( labelStyle );
- mainForm.addComponent( completedProgramlbl );
- Vector programs = patient.getPrograms();
-
- if ( programs != null )
+ if ( patient.getCompletedPrograms() != null )
{
- for ( int i = 0; i < programs.size(); i++ )
- {
- if ( ((Program) programs.elementAt( i )).getIsCompleted() == 1 )
- {
- TextArea completedProgramNameTxt = new TextArea( ((Program) programs.elementAt( i )).getName() );
-
- completedProgramNameTxt.setEditable( false );
- completedProgramNameTxt.setEnabled( false );
- mainForm.addComponent( completedProgramNameTxt );
- }
- }
+ Label completedProgramlbl = new Label( "Completed Programs" );
+ completedProgramlbl.setUnselectedStyle( labelStyle );
+ completedProgramlbl.setSelectedStyle( labelStyle );
+ mainForm.addComponent( completedProgramlbl );
+ this.prepareCompletedPrograms();
}
Label lblDetail = new Label( "Details" );
@@ -306,95 +297,89 @@
{
for ( int i = 0; i < programs.size(); i++ )
{
- // Program program = ((Program) programs.elementAt( i ));
- if ( ((Program) programs.elementAt( i )).getIsCompleted() != 1 )
+ if ( ((Program) programs.elementAt( i )).getProgramStages().size() > 1 )
{
- if ( ((Program) programs.elementAt( i )).getProgramStages().size() > 1 )
+ LinkButton programLink = new LinkButton( ((Program) programs.elementAt( i )).getName() );
+
+ programLink.addActionListener( new ActionListener()
{
- LinkButton programLink = new LinkButton( ((Program) programs.elementAt( i )).getName() );
-
- programLink.addActionListener( new ActionListener()
- {
-
- public void actionPerformed( ActionEvent ae )
- {
- namebasedMidlet.getProgramStageListView().setPatient( patient );
- namebasedMidlet.getProgramStageListView().showView();
- }
- } );
-
- mainForm.addComponent( programLink );
- // show uncompleted program stage
- for ( int j = 0; j < ((Program) programs.elementAt( i )).getProgramStages().size(); j++ )
- {
- final ProgramStage programStage = (ProgramStage) ((Program) programs.elementAt( i ))
- .getProgramStages().elementAt( j );
- if ( programStage.isCompleted() == false )
- {
- LinkButton programStageLink = new LinkButton( "--" + programStage.getName() );
- programStageLink.addActionListener( new ActionListener()
- {
- public void actionPerformed( ActionEvent arg )
- {
- 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();
- }
- }
- } );
- mainForm.addComponent( programStageLink );
- break;
- }
+ public void actionPerformed( ActionEvent ae )
+ {
+ namebasedMidlet.getProgramStageListView().setPatient( patient );
+ namebasedMidlet.getProgramStageListView().showView();
}
- }
- // show program has only one program stage which is
- // repeatable
- else if ( ((Program) programs.elementAt( i )).getProgramStages().size() == 1 )
+ } );
+
+ mainForm.addComponent( programLink );
+ // show uncompleted program stage
+ for ( int j = 0; j < ((Program) programs.elementAt( i )).getProgramStages().size(); j++ )
{
- // single event
- final ProgramStage programStageSingle = (ProgramStage) ((Program) programs.elementAt( i ))
- .getProgramStages().elementAt( 0 );
- LinkButton programLink = new LinkButton( ((Program) programs.elementAt( i )).getName() );
-
- programLink.addActionListener( new ActionListener()
- {
-
- public void actionPerformed( ActionEvent ae )
- {
- namebasedMidlet.getTrackingDataEntryView().setPatient( patient );
- namebasedMidlet.getTrackingDataEntryView().setProgramStage( programStageSingle );
- namebasedMidlet.getTrackingDataEntryView().setTitle( programStageSingle.getName() );
- namebasedMidlet.getTrackingDataEntryView().showView();
- }
- } );
-
- mainForm.addComponent( programLink );
final ProgramStage programStage = (ProgramStage) ((Program) programs.elementAt( i ))
- .getProgramStages().elementAt( 0 );
- if ( programStage.isRepeatable() )
+ .getProgramStages().elementAt( j );
+ if ( programStage.isCompleted() == false )
{
LinkButton programStageLink = new LinkButton( "--" + programStage.getName() );
programStageLink.addActionListener( new ActionListener()
{
public void actionPerformed( ActionEvent arg )
{
- namebasedMidlet.getTrackingDataEntryView().setPatient( patient );
- namebasedMidlet.getTrackingDataEntryView().setProgramStage( programStage );
- namebasedMidlet.getTrackingDataEntryView().showView();
+ 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();
+ }
}
} );
mainForm.addComponent( programStageLink );
- }
+ break;
+ }
+ }
+ }
+ // show program has only one program stage which is
+ // repeatable
+ else if ( ((Program) programs.elementAt( i )).getProgramStages().size() == 1 )
+ {
+ // single event
+ final ProgramStage programStageSingle = (ProgramStage) ((Program) programs.elementAt( i ))
+ .getProgramStages().elementAt( 0 );
+ LinkButton programLink = new LinkButton( ((Program) programs.elementAt( i )).getName() );
+
+ programLink.addActionListener( new ActionListener()
+ {
+
+ public void actionPerformed( ActionEvent ae )
+ {
+ namebasedMidlet.getTrackingDataEntryView().setPatient( patient );
+ namebasedMidlet.getTrackingDataEntryView().setProgramStage( programStageSingle );
+ namebasedMidlet.getTrackingDataEntryView().setTitle( programStageSingle.getName() );
+ namebasedMidlet.getTrackingDataEntryView().showView();
+ }
+ } );
+
+ mainForm.addComponent( programLink );
+ final ProgramStage programStage = (ProgramStage) ((Program) programs.elementAt( i ))
+ .getProgramStages().elementAt( 0 );
+ if ( programStage.isRepeatable() )
+ {
+ LinkButton programStageLink = new LinkButton( "--" + programStage.getName() );
+ programStageLink.addActionListener( new ActionListener()
+ {
+ public void actionPerformed( ActionEvent arg )
+ {
+ namebasedMidlet.getTrackingDataEntryView().setPatient( patient );
+ namebasedMidlet.getTrackingDataEntryView().setProgramStage( programStage );
+ namebasedMidlet.getTrackingDataEntryView().showView();
+ }
+ } );
+ mainForm.addComponent( programStageLink );
}
}
}
@@ -493,6 +478,18 @@
}
}
+ public void prepareCompletedPrograms()
+ {
+ Vector completedPrograms = patient.getCompletedPrograms();
+ for ( int i = 0; i < completedPrograms.size(); i++ )
+ {
+ TextArea completedProgramNameTxt = new TextArea( ((Program) completedPrograms.elementAt( i )).getName() );
+ completedProgramNameTxt.setEditable( false );
+ completedProgramNameTxt.setEnabled( false );
+ mainForm.addComponent( completedProgramNameTxt );
+ }
+ }
+
public Patient getPatient()
{
return patient;
=== modified file 'src/org/hisp/dhis/mobile/view/PersonListView.java'
--- src/org/hisp/dhis/mobile/view/PersonListView.java 2013-09-08 12:38:35 +0000
+++ src/org/hisp/dhis/mobile/view/PersonListView.java 2013-09-10 11:33:54 +0000
@@ -81,6 +81,7 @@
String patientInfo = (String) patientInfos.elementAt( i );
final String id = patientInfo.substring( 0, patientInfo.indexOf( "/" ) );
+ System.out.println(id);
patientInfo = patientInfo.substring( patientInfo.indexOf( "/" ) + 1, patientInfo.length() );
String name = patientInfo.substring( 0, patientInfo.indexOf( "/" ) );
String birthday = patientInfo.substring( patientInfo.indexOf( "/" ) + 1, patientInfo.length() );
=== modified file 'src/org/hisp/dhis/mobile/view/RegistrationProgramSelectionView.java'
--- src/org/hisp/dhis/mobile/view/RegistrationProgramSelectionView.java 2013-09-10 08:17:24 +0000
+++ src/org/hisp/dhis/mobile/view/RegistrationProgramSelectionView.java 2013-09-10 11:33:54 +0000
@@ -47,8 +47,8 @@
{
if ( ae.getSource() == this.getProgramList() )
{
- Program selectedProgram = (Program) programVector.elementAt( this.getProgramList().getSelectedIndex() );
- nameBasedMIDlet.getPersonRegistrationView().setEnrollProgramId( String.valueOf( selectedProgram.getId() ) );
+ //Program selectedProgram = (Program) programVector.elementAt( this.getProgramList().getSelectedIndex() );
+ nameBasedMIDlet.getPersonRegistrationView().setEnrollProgramId( String.valueOf( ((Program) programVector.elementAt( this.getProgramList().getSelectedIndex() )).getId() ) );
try
{
Vector orgUnitVector = OrgUnitRecordStore.loadAllOrgUnit();
=== modified file 'src/org/hisp/dhis/mobile/view/TrackingMainMenuView.java'
--- src/org/hisp/dhis/mobile/view/TrackingMainMenuView.java 2013-09-10 07:17:17 +0000
+++ src/org/hisp/dhis/mobile/view/TrackingMainMenuView.java 2013-09-10 11:33:54 +0000
@@ -174,7 +174,6 @@
menuList.setSmoothScrolling( true );
menuList.setFixedSelection( List.FIXED_NONE );
menuList.addActionListener( this );
- //menuList.getSelectedStyle().setFont( );
}
return menuList;
}
