dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1905
committer: Bharath <chbharathk@xxxxxxxxx>
branch nick: trunk
timestamp: Fri 2010-08-06 18:34:55 +0530
message:
  Fixed Bugs in Dashboard: ExportToExcel,OrgUnitwise Chart
modified:
  local/in/dhis-web-dashboard/src/main/resources/META-INF/dhis/beans.xml
  local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisResult.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/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-web-dashboard/src/main/resources/META-INF/dhis/beans.xml	2010-07-23 13:05:37 +0000
+++ local/in/dhis-web-dashboard/src/main/resources/META-INF/dhis/beans.xml	2010-08-06 13:04:55 +0000
@@ -706,8 +706,7 @@
 	<bean id="org.hisp.dhis.dashboard.action.ExportToExcelAction"
 		class="org.hisp.dhis.dashboard.action.ExportToExcelAction"
 		scope="prototype">
-		<property name="locationManager"
-			ref="org.hisp.dhis.external.location.LocationManager"/>
+		<property name="locationManager" ref="locationManager" />
 	</bean>
 	
 	<bean id="org.hisp.dhis.dashboard.action.GetSortedDataAction"

=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisResult.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisResult.vm	2010-07-06 09:34:47 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisResult.vm	2010-08-06 13:04:55 +0000
@@ -424,8 +424,12 @@
 			<td class="TableHeadingCellStyles" style="border-style: dotted; border-width: 1">$yseriesList.get($count1)</td>
                 
 			#foreach($data in $onedataList)
-              <td class="TableDataCellStyles" align="center" style="border-style: dotted; border-width: 1"><a href="#" onclick="javascript:drillDownResult( event, '$selectedValues.get($count3)' )" target="_blank">$data</a></td>               		             
-              #set( $count3 = $count3 + 1 )
+				#if( $categoryLB.equals( "period" ) ) 
+					<td class="TableDataCellStyles" align="center" style="border-style: dotted; border-width: 1"><a href="#" onclick="javascript:drillDownResult( event, '$selectedValues.get($count3)' )" target="_blank">$data</a></td>               		             
+					#set( $count3 = $count3 + 1 )
+				#else
+					<td class="TableDataCellStyles" align="center" style="border-style: dotted; border-width: 1">$data</td>
+				#end
 			#end
             #set( $count1 = $count1 + 1 )
           </tr>