dhis-mobile-devs team mailing list archive
-
dhis-mobile-devs team
-
Mailing list archive
-
Message #00286
[Branch ~dhis-mobile-devs/dhis-mobile/lwuit-tracking] Rev 147: change patient DOB to String type
------------------------------------------------------------
revno: 147
committer: Lai <lai.hispvietnam@xxxxxxxxx>
branch nick: lwuit-tracking
timestamp: Wed 2013-09-11 22:25:01 +0700
message:
change patient DOB to String type
modified:
build.xml
src/org/hisp/dhis/mobile/model/Patient.java
src/org/hisp/dhis/mobile/recordstore/PatientRecordStore.java
src/org/hisp/dhis/mobile/util/PeriodUtil.java
src/org/hisp/dhis/mobile/view/PersonDashboardView.java
src/org/hisp/dhis/mobile/view/PersonRegistrationView.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 2013-09-10 16:25:58 +0000
+++ build.xml 2013-09-11 15:25:01 +0000
@@ -34,11 +34,11 @@
<!-- Which logo to use -->
<property name="logo" value="dhis2_logo.png" />
<!-- Server URL -->
- <property name="server.url" value="http://192.168.137.1:9999"; />
+ <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="+8494485878" />
<!-- Default Locale -->
=== modified file 'src/org/hisp/dhis/mobile/model/Patient.java'
--- src/org/hisp/dhis/mobile/model/Patient.java 2013-09-10 16:25:58 +0000
+++ src/org/hisp/dhis/mobile/model/Patient.java 2013-09-11 15:25:01 +0000
@@ -45,7 +45,7 @@
private String gender;
- private Date birthDate;
+ private String birthDate;
private String bloodGroup;
@@ -81,12 +81,12 @@
this.gender = gender;
}
- public Date getBirthDate()
+ public String getBirthDate()
{
return birthDate;
}
- public void setBirthDate( Date birthDate )
+ public void setBirthDate( String birthDate )
{
this.birthDate = birthDate;
}
@@ -333,7 +333,7 @@
if ( din.readBoolean() )
{
- this.setBirthDate( new Date( din.readLong() ) );
+ this.setBirthDate( din.readUTF() );
}
else
{
@@ -542,7 +542,7 @@
if ( birthDate != null )
{
dout.writeBoolean( true );
- dout.writeLong( birthDate.getTime() );
+ dout.writeUTF( birthDate );
}
else
{
=== modified file 'src/org/hisp/dhis/mobile/recordstore/PatientRecordStore.java'
--- src/org/hisp/dhis/mobile/recordstore/PatientRecordStore.java 2013-07-17 03:33:24 +0000
+++ src/org/hisp/dhis/mobile/recordstore/PatientRecordStore.java 2013-09-11 15:25:01 +0000
@@ -143,10 +143,10 @@
Model model = new Model();
SerializationUtil.deSerialize( patient, recordEnumeration.nextRecord() );
- String t = PeriodUtil.dateToString( patient.getBirthDate(), y, m, d );
+ //String t = PeriodUtil.dateToString( patient.getBirthDate(), y, m, d );
model.setId( patient.getId() );
- model.setName( patient.getFullName()+"/"+t );
+ model.setName( patient.getFullName()+"/"+patient.getBirthDate() );
modelList.getModels().addElement( model );
patient = null;
model = null;
=== modified file 'src/org/hisp/dhis/mobile/util/PeriodUtil.java'
--- src/org/hisp/dhis/mobile/util/PeriodUtil.java 2013-07-17 03:16:08 +0000
+++ src/org/hisp/dhis/mobile/util/PeriodUtil.java 2013-09-11 15:25:01 +0000
@@ -291,26 +291,26 @@
String token[] = split( string, '-' );
Calendar cal = Calendar.getInstance();
- cal.set( Calendar.YEAR, Integer.parseInt( token[0] ) );
+ cal.set( Calendar.YEAR, Integer.parseInt( token[2] ) );
+
+ if ( String.valueOf( token[0].charAt( 0 ) ).equals( "0" ) )
+ {
+ cal.set( Calendar.DATE, Integer.parseInt( String.valueOf( token[0].charAt( 1 ) ) ) - 1 );
+
+ }
+ else
+ {
+ cal.set( Calendar.DATE, Integer.parseInt( token[0] ) - 1 );
+
+ }
if ( String.valueOf( token[1].charAt( 0 ) ).equals( "0" ) )
{
- cal.set( Calendar.MONTH, Integer.parseInt( String.valueOf( token[1].charAt( 1 ) ) ) - 1 );
-
- }
- else
- {
- cal.set( Calendar.MONTH, Integer.parseInt( token[1] ) - 1 );
-
- }
-
- if ( String.valueOf( token[2].charAt( 0 ) ).equals( "0" ) )
- {
- cal.set( Calendar.DATE, Integer.parseInt( String.valueOf( token[2].charAt( 1 ) ) ) );
- }
- else
- {
- cal.set( Calendar.DATE, Integer.parseInt( token[2] ) );
+ cal.set( Calendar.MONTH, Integer.parseInt( String.valueOf( token[1].charAt( 1 ) ) ) );
+ }
+ else
+ {
+ cal.set( Calendar.MONTH, Integer.parseInt( token[1] ) );
}
return cal.getTime();
}
=== modified file 'src/org/hisp/dhis/mobile/view/PersonDashboardView.java'
--- src/org/hisp/dhis/mobile/view/PersonDashboardView.java 2013-09-10 11:33:54 +0000
+++ src/org/hisp/dhis/mobile/view/PersonDashboardView.java 2013-09-11 15:25:01 +0000
@@ -170,7 +170,8 @@
}
else
{
- dob.setText( "Date of Birth: " + PeriodUtil.dateToString( patient.getBirthDate(), y, m, d ) );
+ //dob.setText( "Date of Birth: " + PeriodUtil.dateToString( patient.getBirthDate(), y, m, d ) );
+ dob.setText( "Date of Birth: " + patient.getBirthDate() );
}
dob.setEditable( false );
dob.setEnabled( false );
=== modified file 'src/org/hisp/dhis/mobile/view/PersonRegistrationView.java'
--- src/org/hisp/dhis/mobile/view/PersonRegistrationView.java 2013-09-10 16:25:58 +0000
+++ src/org/hisp/dhis/mobile/view/PersonRegistrationView.java 2013-09-11 15:25:01 +0000
@@ -820,7 +820,8 @@
try
{
birthYear = currentYear - Integer.parseInt( dateOfBirth );
- dateOfBirth = birthYear + "-" + currentMonth + "-" + currentDate;
+ //dateOfBirth = birthYear + "-" + currentMonth + "-" + currentDate;
+ dateOfBirth = currentDate + "-" + currentMonth + "-" + birthYear;
}
catch ( Exception e )
{
@@ -828,7 +829,7 @@
}
}
- Date formatBirthdate = null;
+ /*Date formatBirthdate = null;
if ( dateOfBirth != null && !"".equals( dateOfBirth ) )
{
try
@@ -840,7 +841,7 @@
e.printStackTrace();
}
- }
+ }*/
Patient patient = new Patient();
Vector attributeVector = new Vector();
@@ -852,7 +853,7 @@
patient.setGender( genderChar );
patient.setDobType( dateOfBirthType );
patient.setPhoneNumber( phoneNumber );
- patient.setBirthDate( formatBirthdate );
+ patient.setBirthDate( dateOfBirth );
try
{
