=== 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 2011-10-06 05:05:42 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2011-10-06 05:25:34 +0000 @@ -435,4 +435,6 @@ register_event = Register event enroll_to_program = Enroll to program add_dependent = Add dependent -edit_profile = Edit profile \ No newline at end of file +edit_profile = Edit profile +aggregate_details = Aggregate details +show_details = Show details \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml 2011-10-04 06:28:34 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml 2011-10-06 05:25:34 +0000 @@ -257,7 +257,7 @@ - /popup.vm + /content.vm /dhis-web-caseentry/caseAggregationResultDetails.vm === 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 2011-03-24 17:27:39 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResult.vm 2011-10-06 05:25:34 +0000 @@ -23,13 +23,15 @@ #set ( $keys = $mapDataValues.keySet() ) #set ($index = 1) + #set( $mark = false ) #foreach( $key in $keys) - + $index $key.dataElement.getName() $key.getValue() $mapDataValues.get($key) + #set( $mark = !$mark ) #set ($index = $index + 1) #end @@ -37,5 +39,10 @@ #else $i18n.getString('no_value_added_or_update') #end - + +
+ + \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/caseagg.js' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/caseagg.js 2011-08-19 21:33:57 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/caseagg.js 2011-10-06 05:25:34 +0000 @@ -110,9 +110,8 @@ url+= '&periodId=' + periodId; url+= '&aggregationConditionId=' + aggregationConditionId; - $('#contentDetails').dialog('destroy').remove(); - $('
' ).load(url).dialog({ - title: '', + $('#contentDetails' ).load(url).dialog({ + title: i18n_aggregate_details, maximize: true, closable: true, modal:true,