dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #25340
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 12546: update lost to follow up event
------------------------------------------------------------
revno: 12546
committer: Lai <lai.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-10-10 12:42:48 +0700
message:
update lost to follow up event
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/DHISMessageAlertListener.java
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/LWUITmodel/Notification.java
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/PeriodUtil.java
dhis-2/dhis-services/dhis-service-mobile/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileOrganisationUnitController.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-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/DHISMessageAlertListener.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/DHISMessageAlertListener.java 2013-09-04 08:29:08 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/DHISMessageAlertListener.java 2013-10-10 05:42:48 +0000
@@ -131,7 +131,7 @@
Set<User> receivers = new HashSet<User>( userGroup.getMembers() );
- // forward to user group by SMS
+ // forward to user group by SMS,Dhis2 message, Email
messageService.sendMessage( smsCommand.getName(), message, null, receivers, sender, false, false );
// confirm SMS was received and forwarded completely
=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/LWUITmodel/Notification.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/LWUITmodel/Notification.java 2013-10-09 03:02:54 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/LWUITmodel/Notification.java 2013-10-10 05:42:48 +0000
@@ -31,6 +31,7 @@
import java.io.IOException;
import org.hisp.dhis.api.mobile.model.DataStreamSerializable;
+import org.hisp.dhis.api.mobile.model.Model;
/**
* @author Nguyen Kim Lai
@@ -46,9 +47,8 @@
throws IOException
{
dataOutputStream.writeUTF( message );
-
}
-
+
@Override
public void deSerialize( DataInputStream dataInputStream )
throws IOException
=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java 2013-10-09 03:02:54 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java 2013-10-10 05:42:48 +0000
@@ -60,6 +60,9 @@
import org.hisp.dhis.api.mobile.model.comparator.ActivityComparator;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementService;
+import org.hisp.dhis.message.Message;
+import org.hisp.dhis.message.MessageConversation;
+import org.hisp.dhis.message.MessageService;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
import org.hisp.dhis.patient.Patient;
@@ -92,7 +95,10 @@
import org.hisp.dhis.relationship.RelationshipService;
import org.hisp.dhis.relationship.RelationshipType;
import org.hisp.dhis.relationship.RelationshipTypeService;
+import org.hisp.dhis.sms.SmsSender;
import org.hisp.dhis.system.util.DateUtils;
+import org.hisp.dhis.user.CurrentUserService;
+import org.hisp.dhis.user.User;
import org.joda.time.DateTime;
import org.joda.time.Period;
import org.springframework.beans.factory.annotation.Autowired;
@@ -160,6 +166,29 @@
this.patientIdentifierTypeService = patientIdentifierTypeService;
}
+ private CurrentUserService currentUserService;
+
+ @Required
+ public void setCurrentUserService( CurrentUserService currentUserService )
+ {
+ this.currentUserService = currentUserService;
+ }
+
+ private MessageService messageService;
+
+ @Required
+ public void setMessageService( MessageService messageService )
+ {
+ this.messageService = messageService;
+ }
+
+ private SmsSender smsSender;
+
+ public void setSmsSender( SmsSender smsSender )
+ {
+ this.smsSender = smsSender;
+ }
+
public PatientIdentifierTypeService getPatientIdentifierTypeService()
{
return patientIdentifierTypeService;
@@ -1143,11 +1172,15 @@
return mobileProgram;
}
- private List<org.hisp.dhis.api.mobile.model.LWUITmodel.ProgramStage> getMobileProgramStages( ProgramInstance programInstance )
+ private List<org.hisp.dhis.api.mobile.model.LWUITmodel.ProgramStage> getMobileProgramStages(
+ ProgramInstance programInstance )
{
List<org.hisp.dhis.api.mobile.model.LWUITmodel.ProgramStage> mobileProgramStages = new ArrayList<org.hisp.dhis.api.mobile.model.LWUITmodel.ProgramStage>();
-
- /*for ( ProgramStage eachProgramStage : programInstance.getProgram().getProgramStages() )*/
+
+ /*
+ * for ( ProgramStage eachProgramStage :
+ * programInstance.getProgram().getProgramStages() )
+ */
for ( ProgramStageInstance eachProgramStageInstance : programInstance.getProgramStageInstances() )
{
// only for Mujhu database, because there is null program stage
@@ -1155,18 +1188,18 @@
if ( eachProgramStageInstance != null )
{
ProgramStage programStage = eachProgramStageInstance.getProgramStage();
-
+
org.hisp.dhis.api.mobile.model.LWUITmodel.ProgramStage mobileProgramStage = new org.hisp.dhis.api.mobile.model.LWUITmodel.ProgramStage();
List<org.hisp.dhis.api.mobile.model.LWUITmodel.Section> mobileSections = new ArrayList<org.hisp.dhis.api.mobile.model.LWUITmodel.Section>();
mobileProgramStage.setId( eachProgramStageInstance.getId() );
- /*mobileProgramStage.setName( eachProgramStage.getName() );*/
+ /* mobileProgramStage.setName( eachProgramStage.getName() ); */
mobileProgramStage.setName( programStage.getName() );
// get report date
if ( eachProgramStageInstance.getExecutionDate() != null )
{
- mobileProgramStage
- .setReportDate( PeriodUtil.dateToString( eachProgramStageInstance.getExecutionDate() ) );
+ mobileProgramStage.setReportDate( PeriodUtil.dateToString( eachProgramStageInstance
+ .getExecutionDate() ) );
}
else
{
@@ -1187,8 +1220,11 @@
mobileProgramStage.setRepeatable( programStage.getIrregular() );
// is completed
- /*mobileProgramStage.setCompleted( checkIfProgramStageCompleted( patient, programInstance.getProgram(),
- programStage ) );*/
+ /*
+ * mobileProgramStage.setCompleted(
+ * checkIfProgramStageCompleted( patient,
+ * programInstance.getProgram(), programStage ) );
+ */
mobileProgramStage.setCompleted( eachProgramStageInstance.isCompleted() );
// is single event
@@ -1414,7 +1450,7 @@
throws NotAllowedException
{
String programsInfo = "";
-
+
int programTypeInt = Integer.valueOf( programType );
OrganisationUnit organisationUnit = organisationUnitService.getOrganisationUnit( orgUnitId );
@@ -1430,7 +1466,6 @@
{
tempPrograms = new ArrayList<Program>(
programService.getProgramsByCurrentUser( Program.MULTIPLE_EVENTS_WITH_REGISTRATION ) );
- System.out.println("Program size: " + tempPrograms.size());
}
List<Program> programs = new ArrayList<Program>();
@@ -1448,7 +1483,7 @@
if ( programs.size() == 1 )
{
Program program = programs.get( 0 );
-
+
return getMobileProgramWithoutData( program );
}
else
@@ -1491,8 +1526,10 @@
}
}
- //If the return program is anonymous, the client side will show the entry form as normal
- //If the return program is not anonymous, it is still OK because in client side, we only need name and id
+ // If the return program is anonymous, the client side will show the entry
+ // form as normal
+ // If the return program is not anonymous, it is still OK because in client
+ // side, we only need name and id
private org.hisp.dhis.api.mobile.model.LWUITmodel.Program getMobileProgramWithoutData( Program program )
{
Comparator<ProgramStageDataElement> OrderBySortOrder = new Comparator<ProgramStageDataElement>()
@@ -1512,31 +1549,31 @@
if ( program.getType() == Program.SINGLE_EVENT_WITHOUT_REGISTRATION )
{
anonymousProgramMobile.setVersion( program.getVersion() );
-
+
anonymousProgramMobile.setStatus( ProgramInstance.STATUS_ACTIVE );
-
+
ProgramStage programStage = program.getProgramStages().iterator().next();
-
+
List<ProgramStageDataElement> programStageDataElements = new ArrayList<ProgramStageDataElement>(
programStage.getProgramStageDataElements() );
Collections.sort( programStageDataElements, OrderBySortOrder );
-
+
List<org.hisp.dhis.api.mobile.model.LWUITmodel.ProgramStage> mobileProgramStages = new ArrayList<org.hisp.dhis.api.mobile.model.LWUITmodel.ProgramStage>();
-
+
org.hisp.dhis.api.mobile.model.LWUITmodel.ProgramStage mobileProgramStage = new org.hisp.dhis.api.mobile.model.LWUITmodel.ProgramStage();
-
+
List<org.hisp.dhis.api.mobile.model.LWUITmodel.ProgramStageDataElement> mobileProgramStageDataElements = new ArrayList<org.hisp.dhis.api.mobile.model.LWUITmodel.ProgramStageDataElement>();
-
+
mobileProgramStage.setId( programStage.getId() );
mobileProgramStage.setName( programStage.getName() );
mobileProgramStage.setCompleted( false );
mobileProgramStage.setRepeatable( false );
mobileProgramStage.setSingleEvent( true );
mobileProgramStage.setSections( new ArrayList<Section>() );
-
+
// get report date
mobileProgramStage.setReportDate( PeriodUtil.dateToString( new Date() ) );
-
+
if ( programStage.getReportDateDescription() == null )
{
mobileProgramStage.setReportDateDescription( "Report Date" );
@@ -1545,24 +1582,25 @@
{
mobileProgramStage.setReportDateDescription( programStage.getReportDateDescription() );
}
-
+
for ( ProgramStageDataElement programStageDataElement : programStageDataElements )
{
org.hisp.dhis.api.mobile.model.LWUITmodel.ProgramStageDataElement mobileDataElement = new org.hisp.dhis.api.mobile.model.LWUITmodel.ProgramStageDataElement();
mobileDataElement.setId( programStageDataElement.getDataElement().getId() );
mobileDataElement.setName( programStageDataElement.getDataElement().getName() );
mobileDataElement.setType( programStageDataElement.getDataElement().getType() );
-
+
// problem
mobileDataElement.setCompulsory( programStageDataElement.isCompulsory() );
-
+
mobileDataElement.setNumberType( programStageDataElement.getDataElement().getNumberType() );
-
+
mobileDataElement.setValue( "" );
-
+
if ( programStageDataElement.getDataElement().getOptionSet() != null )
{
- mobileDataElement.setOptionSet( modelMapping.getOptionSet( programStageDataElement.getDataElement() ) );
+ mobileDataElement
+ .setOptionSet( modelMapping.getOptionSet( programStageDataElement.getDataElement() ) );
}
else
{
@@ -1653,7 +1691,6 @@
}
}
-
public Collection<PatientIdentifierType> getIdentifierTypes()
{
patientIdentifierTypes = patientIdentifierTypeService.getAllPatientIdentifierTypes();
@@ -1782,7 +1819,7 @@
throws NotAllowedException
{
org.hisp.dhis.patient.Patient patientWeb = new org.hisp.dhis.patient.Patient();
-
+
patientWeb.setName( patient.getName() );
patientWeb.setGender( patient.getGender() );
patientWeb.setDobType( patient.getDobType() );
@@ -2021,15 +2058,48 @@
{
return "";
}
-
}
@Override
public Notification handleLostToFollowUp( LostEvent lostEvent )
throws NotAllowedException
{
+ ProgramStageInstance programStageInstance = programStageInstanceService.getProgramStageInstance( lostEvent.getId() );
+ programStageInstance.setDueDate( PeriodUtil.stringToDate( lostEvent.getDueDate() ) );
+ programStageInstance.setStatus( lostEvent.getStatus() );
+
+ List<MessageConversation> conversationList = new ArrayList<MessageConversation>();
+
+ MessageConversation conversation = new MessageConversation( lostEvent.getName(), currentUserService.getCurrentUser() );
+
+ conversation.addMessage( new Message( lostEvent.getComment(), null, currentUserService.getCurrentUser() ) );
+
+ conversation.setRead( true );
+
+ conversationList.add( conversation );
+
+ programStageInstance.setMessageConversations( conversationList );
+
+ messageService.saveMessageConversation( conversation );
+
+ programStageInstanceService.updateProgramStageInstance( programStageInstance );
+
Notification notification = new Notification();
+ String message = "";
+
+ //send SMS
+ if ( programStageInstance.getProgramInstance().getPatient().getPhoneNumber() != null && lostEvent.getSMS() != null )
+ {
+ User user = new User();
+ user.setPhoneNumber( programStageInstance.getProgramInstance().getPatient().getPhoneNumber() );
+ List<User> recipientsList = new ArrayList<User>();
+ recipientsList.add( user );
+
+ message = smsSender.sendMessage( lostEvent.getName(), lostEvent.getSMS(), currentUserService.getCurrentUser(), recipientsList, false );
+ }
+ notification.setMessage( message );
+
return notification;
}
}
=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/PeriodUtil.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/PeriodUtil.java 2013-09-30 19:54:38 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/PeriodUtil.java 2013-10-10 05:42:48 +0000
@@ -164,13 +164,13 @@
public static String dateToString( Date date )
{
- DateFormat dateFormat = new SimpleDateFormat( "dd-MM-yyyy" );
+ DateFormat dateFormat = new SimpleDateFormat( "yyyy-MM-dd" );
return dateFormat.format( date );
}
public static Date stringToDate( String dateString )
{
- SimpleDateFormat dateFormat = new SimpleDateFormat( "dd-MM-yyyy" );
+ SimpleDateFormat dateFormat = new SimpleDateFormat( "yyyy-MM-dd" );
Date date = null;
try
{
=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/resources/META-INF/dhis/beans.xml 2013-10-08 17:16:47 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/resources/META-INF/dhis/beans.xml 2013-10-10 05:42:48 +0000
@@ -36,6 +36,9 @@
<property name="patientAttributeService" ref="org.hisp.dhis.patient.PatientAttributeService"></property>
<property name="relationshipTypeService" ref="org.hisp.dhis.relationship.RelationshipTypeService"></property>
<property name="programStageService" ref="org.hisp.dhis.program.ProgramStageService" />
+ <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
+ <property name="messageService" ref="org.hisp.dhis.message.MessageService" />
+ <property name="smsSender" ref="org.hisp.dhis.sms.SmsSender" />
</bean>
<bean id="org.hisp.dhis.mobile.api.IProgramService" class="org.hisp.dhis.mobile.service.DefaultProgramService">
=== modified file 'dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileOrganisationUnitController.java'
--- dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileOrganisationUnitController.java 2013-10-09 08:24:00 +0000
+++ dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileOrganisationUnitController.java 2013-10-10 05:42:48 +0000
@@ -49,6 +49,7 @@
import org.hisp.dhis.api.mobile.model.SMSCode;
import org.hisp.dhis.api.mobile.model.SMSCommand;
import org.hisp.dhis.api.mobile.model.LWUITmodel.LostEvent;
+import org.hisp.dhis.api.mobile.model.LWUITmodel.Notification;
import org.hisp.dhis.api.mobile.model.LWUITmodel.Patient;
import org.hisp.dhis.api.mobile.model.LWUITmodel.PatientIdentifierAndAttribute;
import org.hisp.dhis.api.mobile.model.LWUITmodel.Program;
@@ -405,10 +406,10 @@
@RequestMapping( method = RequestMethod.POST, value = "{clientVersion}/LWUIT/orgUnits/{id}/handleLostToFollowUpUrl" )
@ResponseBody
- public Patient handleLostToFollowUp( @PathVariable int id, @RequestBody LostEvent lostEvent )
+ public Notification handleLostToFollowUp( @PathVariable int id, @RequestBody LostEvent lostEvent )
+ throws NotAllowedException
{
- System.out.println(lostEvent);
- return null;
+ return activityReportingService.handleLostToFollowUp( lostEvent );
}
// Supportive methods
