------------------------------------------------------------
revno: 11992
committer: Tran Chau <[email protected]>
branch nick: dhis2
timestamp: Mon 2013-09-09 21:47:21 +0700
message:
Fixed bug - Error when to open program report in Dashboard.
modified:
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.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-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-09-06 07:54:55 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java 2013-09-09 14:47:21 +0000
@@ -579,11 +579,14 @@
PatientComment comment = programStageInstance.getPatientComment();
- grid.addRow();
- grid.addValue( i18n.getString( "comment" ) + " " + i18n.getString( "on" ) + " "
- + format.formatDateTime( comment.getCreatedDate() ) );
- grid.addValue( comment.getCommentText() );
-
+ if ( comment != null )
+ {
+ grid.addRow();
+ grid.addValue( i18n.getString( "comment" ) + " " + i18n.getString( "on" ) + " "
+ + format.formatDateTime( comment.getCreatedDate() ) );
+ grid.addValue( comment.getCommentText() );
+ }
+
// SMS messages
List<OutboundSms> messasges = programStageInstance.getOutboundSms();
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
