------------------------------------------------------------ revno: 10508 committer: Tran Chau <tran.hispviet...@gmail.com> branch nick: dhis2 timestamp: Wed 2013-04-10 11:39:05 +0700 message: Display category-option-combo name in the result of Manual Person Aggregation. modified: dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResult.vm dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingList.vm
-- 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-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResult.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResult.vm 2013-03-11 13:09:11 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResult.vm 2013-04-10 04:39:05 +0000 @@ -46,7 +46,7 @@ #set( $item=$dataValue.dataElement.id + '_' + $dataValue.optionCombo.id + '_' + $period.periodType.name + '_' + $format.formatDate($period.startDate) + '_' + $orgunit.id + '_' + $dataValue.value ) <input type='checkbox' name='aggregateValues' value='$item'> </td> - <td>$dataValue.dataElement.name</td> + <td>$dataValue.dataElement.name $dataValue.optionCombo.name </td> <td>$dataValue.value</td> <td>$!mapStatusValues.get( $statusKey )</td> <td> === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingList.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingList.vm 2013-03-02 15:09:06 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingList.vm 2013-04-10 04:39:05 +0000 @@ -130,7 +130,7 @@ <th>$i18n.getString( "sender" )</th> <th>$i18n.getString( "message" )</th> </tr> - <tbody id='commentTB'> + <tbody id='commentTB' name='commentTB'> #foreach( $comment in $comments ) <tr id="comment_$comment.id"> <td>$format.formatDateTime($comment.createdDate)</td>
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
