dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2050
committer: Bharath Kumar <chbharathk@xxxxxxxxx>
branch nick: trunk
timestamp: Mon 2010-06-28 16:53:06 +0530
message:
  Bug Fixed in India Reports Module
modified:
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/api/Chart.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/action/CreateChartAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/action/SaveChartAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/action/GenerateDataSetReportDataSourceAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/tablecreator/action/SaveTableAction.java


--
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-reports-national/src/main/java/org/hisp/dhis/reports/api/Chart.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/api/Chart.java	2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/api/Chart.java	2010-06-28 11:23:06 +0000
@@ -35,7 +35,7 @@
 import org.hisp.dhis.indicator.Indicator;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.period.Period;
-import org.hisp.dhis.reporttable.RelativePeriods;
+import org.hisp.dhis.period.RelativePeriods;
 
 /**
  * @author Lars Helge Overland

=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/action/CreateChartAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/action/CreateChartAction.java	2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/action/CreateChartAction.java	2010-06-28 11:23:06 +0000
@@ -105,10 +105,10 @@
         
         DataMartInternalProcess process = (DataMartInternalProcess) executor.getProcess();
         
-        process.setDataElementIds( new HashSet<Integer>() );
-        process.setIndicatorIds( getIdentifiers( Indicator.class, chart.getIndicators() ) );
-        process.setPeriodIds( getIdentifiers( Period.class, chart.getPeriods() ) );
-        process.setOrganisationUnitIds( getIdentifiers( OrganisationUnit.class, chart.getOrganisationUnits() ) );
+        //process.setDataElementIds( new HashSet<Integer>() );
+        //process.setIndicatorIds( getIdentifiers( Indicator.class, chart.getIndicators() ) );
+        //process.setPeriodIds( getIdentifiers( Period.class, chart.getPeriods() ) );
+        //process.setOrganisationUnitIds( getIdentifiers( OrganisationUnit.class, chart.getOrganisationUnits() ) );
 
         processCoordinator.requestProcessExecution( executor );
         

=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/action/SaveChartAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/action/SaveChartAction.java	2010-06-08 08:11:39 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/action/SaveChartAction.java	2010-06-28 11:23:06 +0000
@@ -40,7 +40,7 @@
 import org.hisp.dhis.organisationunit.OrganisationUnitService;
 import org.hisp.dhis.period.Period;
 import org.hisp.dhis.period.PeriodService;
-import org.hisp.dhis.reporttable.RelativePeriods;
+import org.hisp.dhis.period.RelativePeriods;
 import org.hisp.dhis.system.util.ConversionUtils;
 
 import com.opensymphony.xwork2.Action;
@@ -298,10 +298,10 @@
         relatives.setReportingMonth( reportingMonth );
         relatives.setLast3Months( last3Months );
         relatives.setLast6Months( last6Months );
-        relatives.setLast9Months( last9Months );
+        //relatives.setLast9Months( last9Months );
         relatives.setLast12Months( last12Months );
         relatives.setSoFarThisYear( soFarThisYear );
-        relatives.setSoFarThisFinancialYear( soFarThisFinancialYear );
+        //relatives.setSoFarThisFinancialYear( soFarThisFinancialYear );
         relatives.setLast3To6Months( last3To6Months );
         relatives.setLast6To9Months( last6To9Months );
         relatives.setLast9To12Months( last9To12Months );

=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/action/GenerateDataSetReportDataSourceAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/action/GenerateDataSetReportDataSourceAction.java	2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/action/GenerateDataSetReportDataSourceAction.java	2010-06-28 11:23:06 +0000
@@ -96,10 +96,11 @@
         List<Integer> organisationUnits = new ArrayList<Integer>();
         organisationUnits.add( selectedStateManager.getSelectedOrganisationUnit().getId() );
         
-        process.setDataElementIds( getIdentifiers( DataElement.class, selectedStateManager.getSelectedDataSet().getDataElements() ) );
-        process.setIndicatorIds( new ArrayList<Integer>() );
-        process.setPeriodIds( periods  );
-        process.setOrganisationUnitIds( organisationUnits );
+        
+        //process.setDataElementIds( getIdentifiers( DataElement.class, selectedStateManager.getSelectedDataSet().getDataElements() ) );
+        //process.setIndicatorIds( new ArrayList<Integer>() );
+        //process.setPeriodIds( periods  );
+        //process.setOrganisationUnitIds( organisationUnits );
 
         processCoordinator.requestProcessExecution( executor );
 

=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/tablecreator/action/SaveTableAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/tablecreator/action/SaveTableAction.java	2010-06-08 08:11:39 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/tablecreator/action/SaveTableAction.java	2010-06-28 11:23:06 +0000
@@ -34,8 +34,8 @@
 
 import org.hisp.dhis.dataelement.DataElement;
 import org.hisp.dhis.dataelement.DataElementCategoryCombo;
+import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
 import org.hisp.dhis.dataelement.DataElementCategoryService;
-import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
 import org.hisp.dhis.dataelement.DataElementService;
 import org.hisp.dhis.dataset.DataSet;
 import org.hisp.dhis.dataset.DataSetService;
@@ -45,7 +45,7 @@
 import org.hisp.dhis.organisationunit.OrganisationUnitService;
 import org.hisp.dhis.period.Period;
 import org.hisp.dhis.period.PeriodService;
-import org.hisp.dhis.reporttable.RelativePeriods;
+import org.hisp.dhis.period.RelativePeriods;
 import org.hisp.dhis.reporttable.ReportParams;
 import org.hisp.dhis.reporttable.ReportTable;
 import org.hisp.dhis.reporttable.ReportTableService;
@@ -374,10 +374,10 @@
         relatives.setReportingMonth( reportingMonth );
         relatives.setLast3Months( last3Months );
         relatives.setLast6Months( last6Months );
-        relatives.setLast9Months( last9Months );
+        //relatives.setLast9Months( last9Months );
         relatives.setLast12Months( last12Months );
         relatives.setSoFarThisYear( soFarThisYear );
-        relatives.setSoFarThisFinancialYear( soFarThisFinancialYear );
+        //relatives.setSoFarThisFinancialYear( soFarThisFinancialYear );
         relatives.setLast3To6Months( last3To6Months );
         relatives.setLast6To9Months( last6To9Months );
         relatives.setLast9To12Months( last9To12Months );