=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java 2013-04-11 03:23:04 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java 2013-05-28 05:49:19 +0000 @@ -44,9 +44,12 @@ import org.hisp.dhis.patient.PatientReminder; import org.hisp.dhis.patientattributevalue.PatientAttributeValue; import org.hisp.dhis.patientattributevalue.PatientAttributeValueService; +import org.hisp.dhis.patientcomment.PatientComment; import org.hisp.dhis.patientdatavalue.PatientDataValue; import org.hisp.dhis.patientdatavalue.PatientDataValueService; +import org.hisp.dhis.sms.outbound.OutboundSms; import org.hisp.dhis.system.grid.ListGrid; +import org.smslib.OutboundMessage; import org.springframework.transaction.annotation.Transactional; /** @@ -324,9 +327,8 @@ // Headers // --------------------------------------------------------------------- - grid.addHeader( new GridHeader( i18n.getString( "name" ), false, false ) ); - grid.addHeader( new GridHeader( i18n.getString( "value" ), false, false ) ); - grid.addHeader( new GridHeader( "", true, false ) ); + grid.addHeader( new GridHeader( "", false, false ) ); + grid.addHeader( new GridHeader( "", false, false ) ); // --------------------------------------------------------------------- // Grids for program-stage-instance @@ -336,6 +338,59 @@ grid.addValue( programInstance.getProgram().getDateOfEnrollmentDescription() ); grid.addValue( format.formatDate( programInstance.getEnrollmentDate() ) ); + // Get patient-identifiers which belong to the program + + Patient patient = programInstance.getPatient(); + + Collection identifierTypes = programInstance.getProgram().getPatientIdentifierTypes(); + + Collection identifiers = patient.getIdentifiers(); + + if ( identifiers.size() > 0 ) + { + for ( PatientIdentifierType identifierType : identifierTypes ) + { + for ( PatientIdentifier identifier : identifiers ) + { + if ( identifier.getIdentifierType().equals( identifierType ) ) + { + grid.addRow(); + grid.addValue( identifierType.getDisplayName() ); + grid.addValue( identifier.getIdentifier() ); + } + } + } + } + + // Get patient-attribute-values which belong to the program + + Collection attrtibutes = programInstance.getProgram().getPatientAttributes(); + for ( PatientAttribute attrtibute : attrtibutes ) + { + PatientAttributeValue attributeValue = patientAttributeValueService.getPatientAttributeValue( patient, + attrtibute ); + if ( attributeValue != null ) + { + grid.addRow(); + grid.addValue( attrtibute.getDisplayName() ); + grid.addValue( attributeValue.getValue() ); + } + } + + // Get sms of the program-instance + + List messasges = programInstance.getOutboundSms(); + + for ( OutboundSms messasge : messasges ) + { + grid.addRow(); + grid.addValue( i18n.getString( "message" ) + " " + i18n.getString( "on" ) + " " + + format.formatDateTime( messasge.getDate() ) ); + grid.addValue( messasge.getMessage() ); + } + + // Program-instance attributes + if ( programInstance.getProgram().getDisplayIncidentDate() != null && programInstance.getProgram().getDisplayIncidentDate() ) { @@ -392,7 +447,7 @@ grid.addValue( "" ); grid.addRow(); - grid.addValue( ">> " + programStageInstance.getProgramStage().getName() ); + grid.addValue( programStageInstance.getProgramStage().getName() ); grid.addValue( "" ); // ----------------------------------------------------------------- @@ -410,6 +465,30 @@ grid.addValue( format.formatDate( programStageInstance.getExecutionDate() ) ); } + // Comments + + List comments = new ArrayList( programStageInstance.getPatientComments() ); + + for ( PatientComment comment : comments ) + { + grid.addRow(); + grid.addValue( i18n.getString( "comment" ) + " " + i18n.getString( "on" ) + " " + + format.formatDateTime( comment.getCreatedDate() ) ); + grid.addValue( comment.getCommentText() ); + } + + // SMS messages + + List messasges = programStageInstance.getOutboundSms(); + + for ( OutboundSms messasge : messasges ) + { + grid.addRow(); + grid.addValue( i18n.getString( "messsage" ) + " " + i18n.getString( "on" ) + " " + + format.formatDateTime( messasge.getDate() ) ); + grid.addValue( messasge.getMessage() ); + } + // ----------------------------------------------------------------- // Values // ----------------------------------------------------------------- @@ -422,7 +501,7 @@ DataElement dataElement = patientDataValue.getDataElement(); grid.addRow(); - grid.addValue( dataElement.getName() ); + grid.addValue( dataElement.getFormNameFallback() ); if ( dataElement.getType().equals( DataElement.VALUE_TYPE_BOOL ) ) { === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2013-05-23 16:04:26 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2013-05-28 05:49:19 +0000 @@ -416,9 +416,9 @@ please_select_program_stage = Please select program stage comment_added = Comment added enroll_program = Enroll into program -comments_and_sms_message = Comments and messages +comments_and_sms_message = Message history no_message = No message -program_reports = Program reports +program_report = Program report show_hide_content = Show/Hide content completed_date = Completed date find_and_add_person = Find/Add Person @@ -626,7 +626,7 @@ unmark_followup = Un-mark followup mark_followup = Mark followup save_comment = Save comment -program_enrollement = Program enrollement +program_enrollment = Program enrollment stored_by = Stored by stored_date = Stored date marked = Marked @@ -646,4 +646,7 @@ list_events = List events orgunit_code = Code display_orgunit_code = Display orgunit code -hide = Hide \ No newline at end of file +hide = Hide +none_program = None program +none_dataset = None dataset +access_log = Access Log \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/eventMessage.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/eventMessage.vm 2013-01-23 10:27:28 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/eventMessage.vm 2013-05-28 05:49:19 +0000 @@ -11,6 +11,7 @@ $i18n.getString( "date" ) $i18n.getString( "program_stage" ) $i18n.getString( "sender" ) + $i18n.getString( "type" ) $i18n.getString( "message" ) @@ -21,6 +22,7 @@ $format.formatDateTime($comment.createdDate) $programStageInstance.programStage.displayName + $i18n.getString('comment') $comment.creator $comment.commentText @@ -33,6 +35,7 @@ $format.formatDateTime($!sms.date) $programStageInstance.programStage.displayName $sms.sender + $i18n.getString('message') $sms.message #set( $mark = !$mark ) === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm 2013-05-21 04:39:29 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm 2013-05-28 05:49:19 +0000 @@ -1,7 +1,7 @@

$i18n.getString( 'patient_management' ) • $i18n.getString( 'patient_dashboard' ) - » $i18n.getString( 'history' ) + » $i18n.getString( 'access_log' )

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm 2013-05-21 02:48:56 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm 2013-05-28 05:49:19 +0000 @@ -20,7 +20,7 @@
  • $i18n.getString("reschedule_and_set_status")
  • $i18n.getString("comments_and_sms_message")
    • #end -
  • $i18n.getString("program_reports")
    • +
  • $i18n.getString("program_report")
    • #if( $hasDataEntry == 'true') === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programInstanceHistory.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programInstanceHistory.vm 2012-12-10 12:54:54 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programInstanceHistory.vm 2013-05-28 05:49:19 +0000 @@ -1,27 +1,34 @@ +

    $grid.title

    + - - - #foreach( $header in $grid.getVisibleHeaders() ) - - #end - - - + #set( $mark = false ) #set( $flag = 0 ) + #set( $flagCol = false ) #foreach( $row in $grid.getVisibleRows() ) #foreach( $col in $row ) - #set( $index = ( $velocityCount - 1 ) ) - #if( $grid.getVisibleHeaders().get( $index ).meta ) + #if( $flag == 2 && $velocityCount == 1 ) + + #set( $flag = 0 ) + #set( $flagCol = true ) + #elseif( $velocityCount == 1 && $col != '' ) - #else + #elseif( $col != '' || $flagCol == true) + #set( $flagCol = false ) + #end + + #if($velocityCount == 1) + #set( $flag = 0 ) + #end + #if( $col=='') + #set( $flag = $flag + 1 ) #end #end === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm 2013-05-15 03:40:15 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm 2013-05-28 05:49:19 +0000 @@ -16,7 +16,7 @@ @@ -86,13 +86,16 @@ + #foreach($sms in $programInstance.outboundSms) + ($format.formatDateTime($!sms.date) - $encoder.htmlEncode($sms.sender) ) + $encoder.htmlEncode($sms.message) + #end +
    $!encoder.htmlEncode( $header.name )
    $col
    		$!encoder.htmlEncode( $col )$!col
    -
    $encoder.htmlEncode( $i18n.getString( "program_enrollement" ) )
    +
    $encoder.htmlEncode( $i18n.getString( "program_enrollment" ) )
    $i18n.getString('message')
    - ($format.formatDateTime($!sms.date) - $encoder.htmlEncode($sms.sender) ) - $encoder.htmlEncode($sms.message)
    #end === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2013-05-28 03:16:01 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2013-05-28 05:49:19 +0000 @@ -411,8 +411,4 @@ patient_attribute_visit_schedule = Patient Attribute Visit Schedule patient_attribute_visit_schedule_form = Patient attribute visit schedule intro_patient_attribute_visit_schedule = Allow to configure which person attributes that are added to the visit schedule.This is very useful when the list is printed and used for tracking in the community. -selected_program_stages = Selected program stages -list_events = List events -none_program = None program -none_dataset = None dataset -access_log = Access Log \ No newline at end of file +selected_program_stages = Selected program stages \ No newline at end of file