=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetHistoryChartAction.java' --- dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetHistoryChartAction.java 2012-02-16 19:58:55 +0000 +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetHistoryChartAction.java 2013-02-05 15:46:36 +0000 @@ -91,16 +91,16 @@ // Input // ------------------------------------------------------------------------- - private Integer dataElementId; + private String dataElementId; - public void setDataElementId( Integer dataElementId ) + public void setDataElementId( String dataElementId ) { this.dataElementId = dataElementId; } - private Integer categoryOptionComboId; + private String categoryOptionComboId; - public void setCategoryOptionComboId( Integer categoryOptionComboId ) + public void setCategoryOptionComboId( String categoryOptionComboId ) { this.categoryOptionComboId = categoryOptionComboId; } === modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/history.vm' --- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/history.vm 2013-02-05 15:43:30 +0000 +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/history.vm 2013-02-05 15:46:36 +0000 @@ -78,7 +78,7 @@
$encoder.htmlEncode( $i18n.getString( "history_not_valid" ) )
#else
$encoder.htmlEncode( $i18n.getString( "dataelement_history" ) )
- + #end