=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dashboard/action/ExportToExcelAction.java' --- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dashboard/action/ExportToExcelAction.java 2010-09-23 11:04:04 +0000 +++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dashboard/action/ExportToExcelAction.java 2010-09-28 07:10:26 +0000 @@ -160,9 +160,13 @@ //File outputReportFile = locationManager.getFileForWriting( UUID.randomUUID().toString() + ".xls", "db", "output" ); - String outputReportFile = System.getProperty( "user.home" ) + File.separator + "dhis" + File.separator + configurationService.getConfigurationByKey( Configuration_IN.KEY_REPORTFOLDER ).getValue() - + File.separator + "output" + File.separator + UUID.randomUUID().toString() + ".xls"; + // String outputReportFile = System.getProperty( "user.home" ) + File.separator + "dhis" + File.separator + configurationService.getConfigurationByKey( Configuration_IN.KEY_REPORTFOLDER ).getValue() + // + File.separator + "output" + File.separator + UUID.randomUUID().toString() + ".xls"; + String outputReportFile = System.getenv( "DHIS2_HOME" ) + File.separator + configurationService.getConfigurationByKey( Configuration_IN.KEY_REPORTFOLDER ).getValue() + + File.separator + "output" + File.separator + UUID.randomUUID().toString() + ".xls"; + System.out.println("Env Variable is :" + System.getenv( "DHIS2_HOME" ) ); + System.out.println("Complete path is :" + outputReportFile ); WritableWorkbook outputReportWorkbook = Workbook.createWorkbook( new File(outputReportFile) ); WritableSheet sheet0 = outputReportWorkbook.createSheet( "ChartOutput", 0 ); === modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/annualAnalysisFront.vm' --- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/annualAnalysisFront.vm 2010-06-04 11:50:05 +0000 +++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/annualAnalysisFront.vm 2010-09-28 07:10:26 +0000 @@ -54,7 +54,7 @@ @@ -80,7 +80,7 @@ $i18n.getString( "ga_available_indicatorlist" )