dhis2-devs team mailing list archive

Thread
Date
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1992: Merged Report Module from India Branch to Global Branch

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Sat, 28 Aug 2010 10:18:30 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx
------------------------------------------------------------
revno: 1992
committer: Mithilesh Kumar Thakur<mithilesh.hisp@xxxxxxxxx>
branch nick: trunk
timestamp: Sat 2010-08-28 15:45:38 +0530
message:
  Merged Report Module from India Branch to Global Branch
removed:
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/api/
  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/ChartStore.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/api/PivotTable.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/api/PivotTableService.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/api/Report.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/api/impl/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/api/impl/DefaultPivotTableService.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/action/
  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/GenerateChartAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/action/GetAllChartsAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/action/GetChartAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/action/GetChartOptionsAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/action/RemoveChartAction.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/chart/action/ValidateChartAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/action/ViewChartAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/impl/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/impl/DefaultChartService.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/completeness/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/completeness/pdf/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/completeness/pdf/DataCompletenessPDFGenerator.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/completeness/util/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/completeness/util/OutputGenerator.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/completeness/util/OutputGeneratorPipeThread.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/action/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/action/AbstractAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/action/GenerateCustomDataSetReportAction.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/dataset/action/GenerateDefaultDataSetReportAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/action/GetAllDataSetsAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/action/GetDataSetReportTypeAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/action/GetViewFormStateAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/action/NextPeriodsAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/action/PreviewReportAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/action/PreviousPeriodsAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/action/SelectReportAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/dataaccess/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/dataaccess/Dhis20ReportDataAccess.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/dataaccess/ReportDataAccess.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/dataaccess/ReportDataAccessException.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/generators/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/generators/CustomDataSetReportGenerator.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/generators/DesignGenerator.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/generators/GeneratorException.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/generators/JasperDesignGenerator.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/generators/JasperReportGenerator.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/generators/JasperTabularDesignGenerator.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/generators/JasperTabularReportGenerator.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/generators/ReportGenerator.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/generators/TabularDesignGenerator.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/generators/TabularReportGenerator.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/report/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/report/ChartElement.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/report/Element.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/report/OrgUnitSpecificElement.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/report/Report.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/report/ReportStore.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/report/ReportStoreException.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/report/XmlReportStore.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/state/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/state/DefaultSelectedStateManager.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/state/SelectedStateManager.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/utils/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/utils/CollectionMapDataSource.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/utils/FileUtils.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/utils/JRXmlFilter.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/utils/NumberUtils.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/utils/XMLUtils.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/utils/XmlFilter.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/pivottable/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/pivottable/action/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/pivottable/action/GetIndicatorGroupsAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/pivottable/action/GetOrganisationUnitLevelsAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/pivottable/action/GetPeriodTypesAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/pivottable/action/GetPivotTableAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/progress/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/progress/action/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/progress/action/GenerateProgressAnalyserResultAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/progress/action/GenerateProgressReportAnalyserFormAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/routine/cumulative/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/routine/cumulative/action/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/routine/cumulative/action/GenerateCumulativeRoutineReportAnalyserFormAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/routine/cumulative/action/GenerateCumulativeRoutineReportAnalyserResultAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/tablecreator/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/tablecreator/action/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/tablecreator/action/CreateTableAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/tablecreator/action/GetAllTablesAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/tablecreator/action/GetReportParamsAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/tablecreator/action/GetStatusAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/tablecreator/action/GetTableAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/tablecreator/action/GetTableOptionsAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/tablecreator/action/RemoveTableAction.java
  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/ValidateTableAction.java
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/cumulativeRoutineReportAnalysisFront.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/menuWithTreeForCumRoutineReport.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/menuWithTreeForProgressReport.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/progressReportAnalysisFront.vm
added:
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/aggregation/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/aggregation/action/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/aggregation/action/GenerateAggregationReportAnalyserFormAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/aggregation/action/GenerateAggregationReportAnalyserResultAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/periodwiseprogress/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/periodwiseprogress/action/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/periodwiseprogress/action/GeneratePeriodWiseProgressAnalyserResultAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/periodwiseprogress/action/GeneratePeriodWiseProgressReportAnalyserFormAction.java
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/aggregationReportAnalysisFront.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/menuWithTreeForAggregationReport.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/menuWithTreeForPeriodWiseProgressReport.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/periodWiseprogressReportAnalysisFront.vm
modified:
  local/in/dhis-in-api/src/main/java/org/hisp/dhis/reports/ReportService.java
  local/in/dhis-in-api/src/main/java/org/hisp/dhis/reports/ReportType.java
  local/in/dhis-in-services/dhis-in-service-reports/src/main/java/org/hisp/dhis/reports/DefaultReportService.java
  local/in/dhis-in-services/dhis-in-service-reports/src/main/resources/META-INF/dhis/beans.xml
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/TwentyPoint/action/GenerateTwentyPointReportsFromAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/action/AddUserAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/action/ExportToExcelAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/action/ExportToExcelAction1.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/action/GetDataElementsAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/action/GetNationalIndicatorReportsAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/action/GetOrgUnitGroupsAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/action/GetOrgUnitsAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/action/GetProgressReportsAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/action/GetReportsAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/action/ReportsHomePageAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/activeplan/action/ActivePlanReportsFormAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/activeplan/action/ActivePlanReportsResultAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/advanced/action/GenerateAdvancedReportResultAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/advanced/action/GenerateAdvancedReportsFormAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/benificiaryinfo/action/BenificiaryInfoReportsFormAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/benificiaryinfo/action/BenificiaryInfoReportsResultAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/datasetlock/action/GenerateDataSetLockReportAnalyserFormAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/datasetlock/action/GenerateDataSetLockReportResultAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/ed/action/EDReportFormAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/ed/action/EDReportResultAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/feedback/action/GenerateFeedbackReportAnalyserFormAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/feedback/action/GenerateFeedbackReportAnalyserResultAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/leprosy/action/LeprosyReportFormAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/linelisting/action/GenerateLinelistingReportAnalyserFormAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/linelisting/action/GenerateLinelistingReportAnalyserResultAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/malarya/action/GenerateMalaryaReportFormAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/orgunitgroupsetreport/action/GenerateOrgunitGroupsetReportsFormAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/ouwiseprogress/action/GenerateOuWiseProgressReportFormAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/ouwiseprogress/action/GenerateOuWiseProgressReportResultAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/portal/action/PortalReportsFormAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/routine/action/GenerateRoutineReportAnalyserFormAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/routine/action/GenerateRoutineReportAnalyserResultAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/upward/action/GenerateUpwardReportAnalyserFormAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/upward/action/GenerateUpwardReportAnalyserResultAction.java
  local/in/dhis-web-reports-national/src/main/resources/META-INF/dhis/beans.xml
  local/in/dhis-web-reports-national/src/main/resources/struts.xml
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/advancedReportsForm.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/feedbackReportAnalysisFront.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/javascript/reports.js
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/linelstingReportAnalyserFront.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/menu.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/menuWithTreeForFeedback.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/menuWithTreeForGOIReports.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/menuWithTreeForLineListingReport.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/menuWithTreeForOuWiseProgress.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/menuWithTreeForRoutineReport.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/ouWiseProgressReportFront.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/routineReportAnalysisFront.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/upwardReportAnalysisFront.vm
The size of the diff (35840 lines) is larger than your specified limit of 1000 lines

--
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