dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2010
committer: Bharath <chbharathk@xxxxxxxxx>
branch nick: trunk
timestamp: Mon 2010-08-30 19:07:40 +0530
message:
  Bug Fixed Dashboard Module
modified:
  local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dashboard/ga/action/charts/GenerateChartDataAction.java
  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/java/org/hisp/dhis/dashboard/ga/action/charts/GenerateChartDataAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dashboard/ga/action/charts/GenerateChartDataAction.java	2010-07-23 13:05:37 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dashboard/ga/action/charts/GenerateChartDataAction.java	2010-08-30 13:37:40 +0000
@@ -341,6 +341,11 @@
     {
         this.ougSetCB = ougSetCB;
     }
+    
+    public String getOugSetCB()
+    {
+        return ougSetCB;
+    }
 
     private String aggDataCB;
 
@@ -878,13 +883,14 @@
                     {
                         decoc = dataElementCategoryService.getDefaultDataElementCategoryOptionCombo();
                     }
-                    String values = selectedOrgUnit.getId() + ":"+ dElement.getId() + ":"+ decoc.getId() + ":" + p.getId();
-                    selectedValues.add(values);
                     
                     if( deSelection.equalsIgnoreCase( "optioncombo" ) )
                     {
                         if( ougSetCB == null )
                         {
+                            String values = selectedOrgUnit.getId() + ":"+ dElement.getId() + ":"+ decoc.getId() + ":" + p.getId();
+                            selectedValues.add(values);
+
                             if( aggDataCB == null )
                             {
                                 DataValue dv1 = dataValueService.getDataValue( selectedOrgUnit, dElement, p, decoc );
@@ -956,6 +962,9 @@
 
                             if ( ougSetCB == null )
                             {
+                                String values = selectedOrgUnit.getId() + ":"+ dElement.getId() + ":"+ decoc1.getId() + ":" + p.getId();
+                                selectedValues.add(values);
+
                                 if ( aggDataCB == null )
                                 {
                                     DataValue dv1 = dataValueService.getDataValue( selectedOrgUnit, dElement, p, decoc1 );

=== 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-08-06 13:04:55 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisResult.vm	2010-08-30 13:37:40 +0000
@@ -424,7 +424,7 @@
 			<td class="TableHeadingCellStyles" style="border-style: dotted; border-width: 1">$yseriesList.get($count1)</td>
                 
 			#foreach($data in $onedataList)
-				#if( $categoryLB.equals( "period" ) ) 
+				#if( $categoryLB.equals( "period" ) && !$ougSetCB ) 
 					<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