dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2262
committer: Mithilesh Kumar Thakur<mithilesh.hisp@xxxxxxxxx>
branch nick: trunk
timestamp: Tue 2010-09-28 12:40:26 +0530
message:
  Bug Fixed In Dashboard
modified:
  local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dashboard/action/ExportToExcelAction.java
  local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/annualAnalysisFront.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 '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 @@
                     				    <select id="indicatorGroupId" name="indicatorGroupId" style="width:325px" onchange="getIndicators()">
                             				<option value="$ALL">[ Select IndicatorGroup / All ]</option>
                             				#foreach ( $group in $indicatorGroups )
-                                					<option value="$group.id">$group.name</option>
+                                					<option value="$group.id" title="$group.name">$group.name</option>
                             				#end
                         			</select>			
                     			</td>
@@ -80,7 +80,7 @@
     			                    $i18n.getString( "ga_available_indicatorlist" )<br />
                         				<select id="availableIndicators" name="availableIndicators" style="width:325px;" ondblclick="moveSelectedById( 'availableIndicators', 'selectedIndicators' )">
 				                            #foreach ( $indicator in $indicators )
-                                				<option value="$indicator.id">$indicator.name</option>
+                                				<option value="$indicator.id" title="$indicator.name">$indicator.name</option>
                             				#end
 			                        	</select>
 			                        <br />