← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4171: local vn:

 

------------------------------------------------------------
revno: 4171
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-07-20 14:16:20 +0700
message:
  local vn:
  - Added new function in allowing user to copy import item to export report.
  - Filtered the respective reports before copying by report type.
  - Renamed stuff.
removed:
  local/vn/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/DefaultImportItemService.java
  local/vn/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/ImportItemService.java
  local/vn/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/ImportItemStore.java
  local/vn/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/hibernate/HibernateImportItemStore.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importreport/action/ShowUpdateImportReportFormAction.java
added:
  local/vn/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/DefaultImportReportService.java
  local/vn/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/ImportReportService.java
  local/vn/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/ImportReportStore.java
  local/vn/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/hibernate/HibernateImportReportStore.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/exportitem/action/GetExportItemTypesAction.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/exportreport/action/ListExportReportByReportTypeAction.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/action/CopyImportItemToExportReportAction.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importreport/action/ListAllImportReportByTypeAction.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importreport/action/SetupImportReportFormAction.java
  local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/jsonItemTypes.vm
modified:
  local/vn/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/DefaultExportReportService.java
  local/vn/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/ExportReportService.java
  local/vn/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/ExportReportStore.java
  local/vn/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/ReportExcelItem.java
  local/vn/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/hibernate/HibernateExportReportStore.java
  local/vn/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/ExcelItemGroup.java
  local/vn/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/ImportItemDeletionHandler.java
  local/vn/dhis-service-excel-reporting/src/main/resources/META-INF/dhis/beans.xml
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/exportitem/action/CopyExportItemToExportReportAction.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/exportitem/action/CopyExportItemToImportReportAction.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importing/ImportDataGeneric.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importing/ViewDataGeneric.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importing/action/GetImportingParamsAction.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importing/action/GetPeriodsByImportReportAction.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importing/action/ImportDataFlowAction.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importing/action/ImportDataOrganizationGroupAction.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importing/action/ViewDataCategoryAction.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importing/action/ViewDataFlowAction.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importing/action/ViewDataNormalAction.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importing/action/ViewDataOrganizationGroupAction.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/action/AddImportItemAction.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/action/CopyImportItemToImportReportAction.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/action/DeleteImportItemAction.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/action/GetImportItemByIdAction.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/action/ListImportItemAction.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/action/SetupImportItemFormAction.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/action/ShowUpdateImportItemFormAction.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/action/UpdateImportItemAction.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/action/UpdateImportItemFormAction.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/action/ValidateImportItemAction.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importreport/action/AddImportReportAction.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importreport/action/DeleteImportReportAction.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importreport/action/GetImportReportByIdAction.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importreport/action/ListAllImportReportAction.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importreport/action/OpenImportReportAssociationsAction.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importreport/action/OpenUpdateOrgUnitGroupForCategoryAction.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importreport/action/UpdateImportReportAction.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importreport/action/UpdateImportReportAssociationsAction.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importreport/action/UpdateOrgUnitGroupAction.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importreport/action/ValidateImportReportAction.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importreport/degroup/action/DeleteDataElementGroupOrderForCategoryAction.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importreport/degroup/action/GetDataElementGroupOrderForCategoryAction.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importreport/degroup/action/SaveDataElementGroupOrderForCategoryAction.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importreport/degroup/action/UpdateDataElementGroupOrderForCategoryAction.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importreport/degroup/action/UpdateSortedDataElementForCategoryAction.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importreport/degroup/action/UpdateSortedDataElementGroupOrderForCategoryAction.java
  local/vn/dhis-web-excel-reporting/src/main/resources/META-INF/dhis/beans.xml
  local/vn/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module.properties
  local/vn/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module_en_GB.properties
  local/vn/dhis-web-excel-reporting/src/main/resources/struts.xml
  local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/import/addImportReport.vm
  local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/import/importItems.vm
  local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/import/updateImportReport.vm
  local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/exportItems.js
  local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/importItems.js
  local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/preview.js
  local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/report/addExportItemForm.vm
  local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/report/exportItems.vm
  local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/report/responseExportItems.vm
The size of the diff (9144 lines) is larger than your specified limit of 5000 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