=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/action/ProvideContentAction.java' --- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/action/ProvideContentAction.java 2012-01-25 17:11:43 +0000 +++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/action/ProvideContentAction.java 2012-02-24 10:55:25 +0000 @@ -103,9 +103,9 @@ return charts; } - private List chartAreas = new ArrayList(); + private List chartAreas = new ArrayList(); - public List getChartAreas() + public List getChartAreas() { return chartAreas; } @@ -137,7 +137,16 @@ for ( int i = 1; i <= chartsInDashboardCount; i++ ) { - chartAreas.add( content.get( DashboardManager.CHART_AREA_PREFIX + i ) ); + Object id = content.get( DashboardManager.CHART_AREA_PREFIX + i ); + + Chart chart = null; + + if ( id != null ) + { + chart = chartService.getChart( Integer.valueOf( String.valueOf( id ) ) ); + } + + chartAreas.add( chart ); } messageCount = messageService.getUnreadMessageConversationCount(); === modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties 2012-02-21 13:32:39 +0000 +++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties 2012-02-24 10:55:25 +0000 @@ -37,3 +37,4 @@ user_roles=User roles meta_data=Meta data sending_message=Sending message +explore=Explore \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dropdown.js' --- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dropdown.js 2011-06-22 18:29:52 +0000 +++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dropdown.js 2012-02-24 10:55:25 +0000 @@ -34,3 +34,8 @@ title : "Viewing Chart" } ); } + +function explore( uid ) +{ + window.location.href = "../dhis-web-visualizer/app/index.html?uid=" + uid; +} \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm' --- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm 2011-11-29 12:01:04 +0000 +++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm 2012-02-24 10:55:25 +0000 @@ -7,6 +7,17 @@ #end +#macro ( chartDropDownButtonDiv $dropDownId $areaDivId $chart ) + +#end + #macro ( linkDropDownListDiv $divId $listId $page )
#end -#macro ( chartDropDownListDiv $divId $listId $chartId ) +#macro ( chartDropDownListDiv $divId $listId $chart )
- #if ( $chartId ) - + #if ( $chart ) + #else $i18n.getString( 'this_is_a_chart_area' ) #end @@ -71,7 +82,7 @@ #if( $startHr ) #end - #dropDownButtonDiv( "chartDropDown${count1}" "chartArea${count1}" ) + #chartDropDownButtonDiv( "chartDropDown${count1}" "chartArea${count1}" $chart ) #chartDropDownListDiv( "chartArea${count1}" "chartDropDown${count1}" $chart ) #end