dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #24522
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 12035: moved fullName split functionality to Patient class
------------------------------------------------------------
revno: 12035
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-09-11 14:12:22 +0200
message:
moved fullName split functionality to Patient class
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/Patient.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/event/person/AbstractPersonService.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/event/person/JacksonPersonService.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/event/person/PersonService.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/AddPatientAction.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/UpdatePatientAction.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/Patient.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/Patient.java 2013-09-06 15:53:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/Patient.java 2013-09-11 12:12:22 +0000
@@ -359,8 +359,8 @@
@JsonProperty
@JsonView( { DetailedView.class, ExportView.class } )
- @JacksonXmlElementWrapper( localName = "programs", namespace = DxfNamespaces.DXF_2_0)
- @JacksonXmlProperty( localName = "program", namespace = DxfNamespaces.DXF_2_0)
+ @JacksonXmlElementWrapper( localName = "programs", namespace = DxfNamespaces.DXF_2_0 )
+ @JacksonXmlProperty( localName = "program", namespace = DxfNamespaces.DXF_2_0 )
public Set<Program> getPrograms()
{
return programs;
@@ -534,6 +534,45 @@
// Getter && Setter
// -------------------------------------------------------------------------
+ public void setFullName( String fullName )
+ {
+ name = fullName;
+
+ if ( fullName == null )
+ {
+ return;
+ }
+
+ fullName = fullName.trim();
+
+ int startIndex = fullName.indexOf( ' ' );
+ int endIndex = fullName.lastIndexOf( ' ' );
+
+ String firstName = fullName;
+ String middleName = "";
+ String lastName = "";
+
+ if ( fullName.indexOf( ' ' ) != -1 )
+ {
+ firstName = fullName.substring( 0, startIndex );
+
+ if ( startIndex == endIndex )
+ {
+ middleName = "";
+ lastName = fullName.substring( startIndex + 1, fullName.length() );
+ }
+ else
+ {
+ middleName = fullName.substring( startIndex + 1, endIndex );
+ lastName = fullName.substring( endIndex + 1, fullName.length() );
+ }
+ }
+
+ this.firstName = firstName;
+ this.middleName = middleName;
+ this.lastName = lastName;
+ }
+
public String getFullName()
{
boolean space = false;
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/event/person/AbstractPersonService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/event/person/AbstractPersonService.java 2013-09-10 15:36:21 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/event/person/AbstractPersonService.java 2013-09-11 12:12:22 +0000
@@ -179,9 +179,25 @@
return person;
}
+ public Patient getPatient( Person person )
+ {
+ Patient patient = new Patient();
+
+
+
+ return patient;
+ }
+
+ @Override
+ public void savePerson( Person person )
+ {
+ Patient patient = getPatient( person );
+ }
+
@Override
public void updatePerson( Person person )
{
+ Patient patient = getPatient( person );
}
@Override
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/event/person/JacksonPersonService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/event/person/JacksonPersonService.java 2013-09-10 14:11:48 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/event/person/JacksonPersonService.java 2013-09-11 12:12:22 +0000
@@ -31,12 +31,13 @@
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.dataformat.xml.XmlMapper;
-import org.hisp.dhis.dxf2.event.person.AbstractPersonService;
import org.hisp.dhis.system.notification.Notifier;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StreamUtils;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.charset.Charset;
/**
* @author Morten Olav Hansen <mortenoh@xxxxxxxxx>
@@ -86,4 +87,46 @@
jsonMapper.configure( DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES, true );
jsonMapper.configure( DeserializationFeature.WRAP_EXCEPTIONS, true );
}
+
+ @Override
+ public void savePersonXml( InputStream inputStream ) throws IOException
+ {
+ String input = StreamUtils.copyToString( inputStream, Charset.forName( "UTF-8" ) );
+
+ try
+ {
+ Persons persons = fromXml( input, Persons.class );
+
+ for ( Person person : persons.getPersons() )
+ {
+ savePerson( person );
+ }
+ }
+ catch ( Exception ex )
+ {
+ Person person = fromXml( input, Person.class );
+ savePerson( person );
+ }
+ }
+
+ @Override
+ public void savePersonJson( InputStream inputStream ) throws IOException
+ {
+ String input = StreamUtils.copyToString( inputStream, Charset.forName( "UTF-8" ) );
+
+ try
+ {
+ Persons persons = fromJson( input, Persons.class );
+
+ for ( Person person : persons.getPersons() )
+ {
+ savePerson( person );
+ }
+ }
+ catch ( Exception ex )
+ {
+ Person person = fromJson( input, Person.class );
+ savePerson( person );
+ }
+ }
}
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/event/person/PersonService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/event/person/PersonService.java 2013-09-10 14:11:48 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/event/person/PersonService.java 2013-09-11 12:12:22 +0000
@@ -28,13 +28,12 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import org.hisp.dhis.dxf2.event.person.Gender;
-import org.hisp.dhis.dxf2.event.person.Person;
-import org.hisp.dhis.dxf2.event.person.Persons;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.patient.Patient;
import org.hisp.dhis.program.Program;
+import java.io.IOException;
+import java.io.InputStream;
import java.util.Collection;
/**
@@ -64,6 +63,12 @@
Person getPerson( Patient patient );
+ void savePersonXml( InputStream inputStream ) throws IOException;
+
+ void savePersonJson( InputStream inputStream ) throws IOException;
+
+ void savePerson( Person person );
+
void updatePerson( Person person );
void deletePerson( Person person );
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/AddPatientAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/AddPatientAction.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/AddPatientAction.java 2013-09-11 12:12:22 +0000
@@ -28,13 +28,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
+import com.opensymphony.xwork2.Action;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.math.NumberUtils;
import org.apache.struts2.ServletActionContext;
@@ -61,7 +55,11 @@
import org.hisp.dhis.setting.SystemSettingManager;
import org.hisp.dhis.user.UserService;
-import com.opensymphony.xwork2.Action;
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
/**
* @author Abyot Asalefew Gizaw
@@ -156,36 +154,7 @@
// Set FirstName, MiddleName, LastName by FullName
// ---------------------------------------------------------------------
- if ( fullName != null )
- {
- fullName = fullName.trim();
-
- int startIndex = fullName.indexOf( ' ' );
- int endIndex = fullName.lastIndexOf( ' ' );
-
- String firstName = fullName.toString();
- String middleName = "";
- String lastName = "";
-
- if ( fullName.indexOf( ' ' ) != -1 )
- {
- firstName = fullName.substring( 0, startIndex );
- if ( startIndex == endIndex )
- {
- middleName = "";
- lastName = fullName.substring( startIndex + 1, fullName.length() );
- }
- else
- {
- middleName = fullName.substring( startIndex + 1, endIndex );
- lastName = fullName.substring( endIndex + 1, fullName.length() );
- }
- }
-
- patient.setFirstName( firstName );
- patient.setMiddleName( middleName );
- patient.setLastName( lastName );
- }
+ patient.setFullName( fullName );
// ---------------------------------------------------------------------
// Set Other information for patient
@@ -212,6 +181,7 @@
patient.setUnderAge( underAge );
patient.setOrganisationUnit( organisationUnit );
patient.setIsDead( isDead );
+
if ( deathDate != null )
{
deathDate = deathDate.trim();
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/UpdatePatientAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/UpdatePatientAction.java 2013-09-10 04:51:49 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/UpdatePatientAction.java 2013-09-11 12:12:22 +0000
@@ -28,12 +28,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
+import com.opensymphony.xwork2.Action;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.math.NumberUtils;
import org.apache.struts2.ServletActionContext;
@@ -55,7 +50,10 @@
import org.hisp.dhis.setting.SystemSettingManager;
import org.hisp.dhis.user.UserService;
-import com.opensymphony.xwork2.Action;
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
/**
* @author Abyot Asalefew Gizaw
@@ -146,36 +144,7 @@
// Set FirstName, MiddleName, LastName by FullName
// ---------------------------------------------------------------------
- if ( fullName != null )
- {
- fullName = fullName.trim();
-
- int startIndex = fullName.indexOf( ' ' );
- int endIndex = fullName.lastIndexOf( ' ' );
-
- String firstName = fullName.toString();
- String middleName = "";
- String lastName = "";
-
- if ( fullName.indexOf( ' ' ) != -1 )
- {
- firstName = fullName.substring( 0, startIndex );
- if ( startIndex == endIndex )
- {
- middleName = "";
- lastName = fullName.substring( startIndex + 1, fullName.length() );
- }
- else
- {
- middleName = fullName.substring( startIndex + 1, endIndex );
- lastName = fullName.substring( endIndex + 1, fullName.length() );
- }
- }
-
- patient.setFirstName( firstName );
- patient.setMiddleName( middleName );
- patient.setLastName( lastName );
- }
+ patient.setFullName( fullName );
// ---------------------------------------------------------------------
// Set Other information for patient
@@ -202,6 +171,7 @@
patient.setUnderAge( underAge );
patient.setOrganisationUnit( organisationUnit );
patient.setIsDead( isDead );
+
if ( deathDate != null )
{
deathDate = deathDate.trim();
