dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7566
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-07-10 21:32:18 +0700
message:
  Exception when to view data-values of events in Program Summary Report.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/ViewRecordsAction.java
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/records.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/java/org/hisp/dhis/caseentry/action/report/ViewRecordsAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/ViewRecordsAction.java	2011-03-31 01:49:21 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/ViewRecordsAction.java	2012-07-10 14:32:18 +0000
@@ -128,13 +128,7 @@
 
         for ( PatientDataValue patientDataValue : patientDataValues )
         {
-            if ( patientDataValue.getDataElement().getType().equalsIgnoreCase( "string" )
-                && patientDataValue.getDataElement().isMultiDimensional() )
-            {
-                DataElementCategoryOptionCombo optionCombo = dataElementCategoryService
-                    .getDataElementCategoryOptionCombo( Integer.parseInt( patientDataValue.getValue() ) );
-                optionValueMap.put( patientDataValue.getDataElement().getId(), optionCombo.getName() );
-            }
+            optionValueMap.put( patientDataValue.getDataElement().getId(), patientDataValue.getValue() );
         }
 
         return SUCCESS;

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/records.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/records.vm	2012-06-07 09:55:49 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/records.vm	2012-07-10 14:32:18 +0000
@@ -27,7 +27,7 @@
 	<tr>
 	    <th>$i18n.getString( "nr" )</th>
 	    <th>$i18n.getString( "data_element" )</th>                   
-	    <th>$i18n.getString( "entry" )</th>
+	    <th>$i18n.getString( "value" )</th>
 	    <th>$i18n.getString( "provided_elsewhere" )</th>             
 	</tr>