dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #13342
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4255: local vn - Cleaned up code and fixed bugs.
------------------------------------------------------------
revno: 4255
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-08-04 15:39:55 +0700
message:
local vn - Cleaned up code and fixed bugs.
removed:
local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/importReports.js
modified:
local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/jchart/JChart.java
local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/jchart/JChartComparator.java
local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/jchart/JChartSeries.java
local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/jchart/JChartStore.java
local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/jchart/hibernate/HibernateJChartStore.java
local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/Bookmark.java
local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/BookmarkService.java
local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/BookmarkStore.java
local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/DataElementGroupOrder.java
local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/ExportReportDeletionHandler.java
local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/ExportReportPeriodColumnListing.java
local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/ExportReportService.java
local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/ExportReportStore.java
local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/PeriodColumn.java
local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/ReportLocationManager.java
local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/comparator/ExportItemNameComparator.java
local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/comparator/ExportReportNameComparator.java
local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/comparator/PeriodColumnComparator.java
local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/hibernate/HibernateBookmarkStore.java
local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/impl/DefaultExportReportService.java
local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/ImportItemDeletionHandler.java
local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/comparator/ImportItemComparator.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/jchart/data/DefaultJChartDataService.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/jchart/data/JChartData.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/jchart/data/JChartDataService.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/jchart/data/JChartSeriesData.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/action/ActionSupport.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/action/NoAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/bookmark/action/DeleteBookmarkAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/bookmark/action/GetAllBookmarkAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/bookmark/action/GetBookmarkAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/bookmark/action/SaveBookmarkAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/bookmark/action/SetBookmarkTypeChartAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/bookmark/action/SetBookmarkTypeCompleteReportAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/configuration/action/BackUpTemplateFilesAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/configuration/action/CheckReportConfigurationAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/configuration/action/GetReportConfigurationAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/configuration/action/SetReportConfigurationAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/datasetcompleted/action/DataSetCompletedReportFormAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/datasetcompleted/action/ViewByPeriodFormAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/datasetcompleted/action/ViewCompletedReportByPeriodsAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/datasetcompleted/action/ViewCustomDataSetReportAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/AbstractGenerateExcelReportSupport.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/GenerateExcelReportGeneric.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GenerateExcelReportFlowAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GetExportReportsByGroupAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/SelectFormAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/ValidateGenerateExportReportAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/GenerateAdvancedReportCategoryAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/GenerateAdvancedReportNormalAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/GenerateAdvancedReportOrgGroupListingAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/GenerateAdvancedReportPeriodColumnListingAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/GetExportReportsByGroupAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/GetOrganisationUnitGroupListAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/SelectAdvancedExportFormAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/AddExportItemAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/CopyExportItemToExportReportAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/CopyExportItemToImportReportAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/DeleteExportItemAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/DeleteMultiExportItemAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/GetDataElementCategoryOptionCombosAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/GetExportItemAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/GetListSheetAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/ListExportItemAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/SetupExportItemFormAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/UpdateExportItemAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportreport/action/AddExportReportAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportreport/action/DeleteExportReportAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportreport/action/GetExportReportGroupsAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportreport/action/ListExportReportAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportreport/action/OpenExportReportAssociationsAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportreport/action/OpenExportReportUserRoleAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportreport/action/UpdateExportReportAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportreport/action/UpdateExportReportAssociationsAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportreport/action/UpdateExportReportUserRoleAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportreport/action/ValidateExportReportAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/filemanager/action/CleanUpDraftFilesAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/filemanager/action/DeleteExcelTemplateAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/filemanager/action/DownloadFileAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/filemanager/action/ExcelTemplateListAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/filemanager/action/RenameExcelTemplateAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/filemanager/action/UpdateExportReportByTemplateAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/filemanager/action/UploadExcelFileAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/filemanager/action/ValidateUploadExcelFile.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importing/action/GetImportingParamsAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importing/action/GetPeriodsByImportReportAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importing/action/ImportDataFlowAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/AddImportItemAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/CopyImportItemToExportReportAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/CopyImportItemToImportReportAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/DeleteImportItemAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/GetImportItemParamAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/GetSelectedDataElementsAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/ListImportItemAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/SetupImportItemFormAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/UpdateImportItemAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/UpdateImportItemFormAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/ValidateImportItemAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importreport/action/AddImportReportAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importreport/action/DeleteImportReportAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importreport/action/ListAllImportReportAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importreport/action/OpenImportReportAssociationsAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importreport/action/OpenUpdateOrgUnitGroupForCategoryAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importreport/action/UpdateImportReportAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importreport/action/UpdateImportReportAssociationsAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importreport/action/UpdateOrgUnitGroupAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importreport/action/ValidateImportReportAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/jchart/action/AddJChartAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/jchart/action/DeleteJChartAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/jchart/action/GetALLJchartAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/jchart/action/GetJChartAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/jchart/action/PrepareDataForAddOrUpdateJChartAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/jchart/action/UpdateJChartAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/jchart/action/UpdateJChartUserRoleAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/jchart/action/UpdateJChartUserRoleFormAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/jchart/action/draw/DrawJChartAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/orgunitgrouplisting/action/ListOrgUnitGroupAtLevelAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/orgunitgrouplisting/action/OpenUpdateOrgUnitGroupAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/orgunitgrouplisting/action/UpdateOrgUnitGroupAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/orgunitgrouplisting/action/UpdateOrgUnitGroupAtLevelAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/period/db/DefaultPeriodDatabaseManager.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/period/db/PeriodDatabaseService.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/period/db/action/GetPeriodsByPeriodTypeAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/period/db/action/NextPeriodsAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/period/db/action/PreviousPeriodsAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/period/generic/action/GetPeriodsByPeriodTypeAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/period/generic/action/NextPeriodsAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/period/generic/action/PreviousPeriodsAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/periodcolumn/action/DeletePeriodColumnAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/periodcolumn/action/GetPeriodColumnAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/periodcolumn/action/SavePeriodColumnAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/periodcolumn/action/UpdatePeriodColumnAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/preview/action/ExportXMLAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/preview/action/XMLStructureResponse.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/preview/action/XMLStructureResponseImport.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/preview/manager/DefaultInitializePOIStylesManager.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/preview/manager/InitializePOIStylesManager.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/state/DefaultSelectionManager.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/state/SelectionManager.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/utils/DateUtils.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/utils/ExcelFileFilter.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/utils/ExpressionUtils.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/utils/FileUtils.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/utils/StringUtils.java
local/vn/dhis-web-spreadsheet-reporting/src/main/resources/META-INF/dhis/beans.xml
local/vn/dhis-web-spreadsheet-reporting/src/main/resources/org/hisp/dhis/reportsheet/i18n_module.properties
local/vn/dhis-web-spreadsheet-reporting/src/main/resources/org/hisp/dhis/reportsheet/i18n_module_vi_VN.properties
local/vn/dhis-web-spreadsheet-reporting/src/main/resources/struts.xml
local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/excelTemplateList.vm
local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/exceltemplate.js
local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/exportItems.js
local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/exportReports.js
local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/report/dataelementExpressionBuilderForm.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/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/jchart/JChart.java'
--- local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/jchart/JChart.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/jchart/JChart.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.jchart;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/jchart/JChartComparator.java'
--- local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/jchart/JChartComparator.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/jchart/JChartComparator.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.jchart;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/jchart/JChartSeries.java'
--- local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/jchart/JChartSeries.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/jchart/JChartSeries.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.jchart;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/jchart/JChartStore.java'
--- local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/jchart/JChartStore.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/jchart/JChartStore.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.jchart;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/jchart/hibernate/HibernateJChartStore.java'
--- local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/jchart/hibernate/HibernateJChartStore.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/jchart/hibernate/HibernateJChartStore.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.jchart.hibernate;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/Bookmark.java'
--- local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/Bookmark.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/Bookmark.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/BookmarkService.java'
--- local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/BookmarkService.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/BookmarkService.java 2011-08-04 08:39:55 +0000
@@ -3,7 +3,7 @@
import java.util.Collection;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/BookmarkStore.java'
--- local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/BookmarkStore.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/BookmarkStore.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/DataElementGroupOrder.java'
--- local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/DataElementGroupOrder.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/DataElementGroupOrder.java 2011-08-04 08:39:55 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/ExportReportDeletionHandler.java'
--- local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/ExportReportDeletionHandler.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/ExportReportDeletionHandler.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/ExportReportPeriodColumnListing.java'
--- local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/ExportReportPeriodColumnListing.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/ExportReportPeriodColumnListing.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/ExportReportService.java'
--- local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/ExportReportService.java 2011-08-03 08:38:38 +0000
+++ local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/ExportReportService.java 2011-08-04 08:39:55 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/ExportReportStore.java'
--- local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/ExportReportStore.java 2011-08-03 08:38:38 +0000
+++ local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/ExportReportStore.java 2011-08-04 08:39:55 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/PeriodColumn.java'
--- local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/PeriodColumn.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/PeriodColumn.java 2011-08-04 08:39:55 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/ReportLocationManager.java'
--- local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/ReportLocationManager.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/ReportLocationManager.java 2011-08-04 08:39:55 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/comparator/ExportItemNameComparator.java'
--- local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/comparator/ExportItemNameComparator.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/comparator/ExportItemNameComparator.java 2011-08-04 08:39:55 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/comparator/ExportReportNameComparator.java'
--- local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/comparator/ExportReportNameComparator.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/comparator/ExportReportNameComparator.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.comparator;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/comparator/PeriodColumnComparator.java'
--- local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/comparator/PeriodColumnComparator.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/comparator/PeriodColumnComparator.java 2011-08-04 08:39:55 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/hibernate/HibernateBookmarkStore.java'
--- local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/hibernate/HibernateBookmarkStore.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/hibernate/HibernateBookmarkStore.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.hibernate;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/impl/DefaultExportReportService.java'
--- local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/impl/DefaultExportReportService.java 2011-08-03 08:38:38 +0000
+++ local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/impl/DefaultExportReportService.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.impl;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/ImportItemDeletionHandler.java'
--- local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/ImportItemDeletionHandler.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/ImportItemDeletionHandler.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.importitem;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/comparator/ImportItemComparator.java'
--- local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/comparator/ImportItemComparator.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/comparator/ImportItemComparator.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.importitem.comparator;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/jchart/data/DefaultJChartDataService.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/jchart/data/DefaultJChartDataService.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/jchart/data/DefaultJChartDataService.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.jchart.data;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/jchart/data/JChartData.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/jchart/data/JChartData.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/jchart/data/JChartData.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.jchart.data;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/jchart/data/JChartDataService.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/jchart/data/JChartDataService.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/jchart/data/JChartDataService.java 2011-08-04 08:39:55 +0000
@@ -3,7 +3,7 @@
import org.hisp.dhis.i18n.I18nManagerException;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/jchart/data/JChartSeriesData.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/jchart/data/JChartSeriesData.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/jchart/data/JChartSeriesData.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.jchart.data;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/action/ActionSupport.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/action/ActionSupport.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/action/ActionSupport.java 2011-08-04 08:39:55 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/action/NoAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/action/NoAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/action/NoAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/bookmark/action/DeleteBookmarkAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/bookmark/action/DeleteBookmarkAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/bookmark/action/DeleteBookmarkAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.bookmark.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/bookmark/action/GetAllBookmarkAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/bookmark/action/GetAllBookmarkAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/bookmark/action/GetAllBookmarkAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.bookmark.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/bookmark/action/GetBookmarkAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/bookmark/action/GetBookmarkAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/bookmark/action/GetBookmarkAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.bookmark.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/bookmark/action/SaveBookmarkAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/bookmark/action/SaveBookmarkAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/bookmark/action/SaveBookmarkAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.bookmark.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/bookmark/action/SetBookmarkTypeChartAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/bookmark/action/SetBookmarkTypeChartAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/bookmark/action/SetBookmarkTypeChartAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.bookmark.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/bookmark/action/SetBookmarkTypeCompleteReportAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/bookmark/action/SetBookmarkTypeCompleteReportAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/bookmark/action/SetBookmarkTypeCompleteReportAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.bookmark.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/configuration/action/BackUpTemplateFilesAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/configuration/action/BackUpTemplateFilesAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/configuration/action/BackUpTemplateFilesAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.configuration.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/configuration/action/CheckReportConfigurationAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/configuration/action/CheckReportConfigurationAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/configuration/action/CheckReportConfigurationAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.configuration.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/configuration/action/GetReportConfigurationAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/configuration/action/GetReportConfigurationAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/configuration/action/GetReportConfigurationAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.configuration.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/configuration/action/SetReportConfigurationAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/configuration/action/SetReportConfigurationAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/configuration/action/SetReportConfigurationAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.configuration.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/datasetcompleted/action/DataSetCompletedReportFormAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/datasetcompleted/action/DataSetCompletedReportFormAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/datasetcompleted/action/DataSetCompletedReportFormAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.datasetcompleted.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/datasetcompleted/action/ViewByPeriodFormAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/datasetcompleted/action/ViewByPeriodFormAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/datasetcompleted/action/ViewByPeriodFormAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.datasetcompleted.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/datasetcompleted/action/ViewCompletedReportByPeriodsAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/datasetcompleted/action/ViewCompletedReportByPeriodsAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/datasetcompleted/action/ViewCompletedReportByPeriodsAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.datasetcompleted.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/datasetcompleted/action/ViewCustomDataSetReportAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/datasetcompleted/action/ViewCustomDataSetReportAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/datasetcompleted/action/ViewCustomDataSetReportAction.java 2011-08-04 08:39:55 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/AbstractGenerateExcelReportSupport.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/AbstractGenerateExcelReportSupport.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/AbstractGenerateExcelReportSupport.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.exporting;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/GenerateExcelReportGeneric.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/GenerateExcelReportGeneric.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/GenerateExcelReportGeneric.java 2011-08-04 08:39:55 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GenerateExcelReportFlowAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GenerateExcelReportFlowAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GenerateExcelReportFlowAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.exporting.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GetExportReportsByGroupAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GetExportReportsByGroupAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GetExportReportsByGroupAction.java 2011-08-04 08:39:55 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/SelectFormAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/SelectFormAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/SelectFormAction.java 2011-08-04 08:39:55 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/ValidateGenerateExportReportAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/ValidateGenerateExportReportAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/ValidateGenerateExportReportAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.exporting.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/GenerateAdvancedReportCategoryAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/GenerateAdvancedReportCategoryAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/GenerateAdvancedReportCategoryAction.java 2011-08-04 08:39:55 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/GenerateAdvancedReportNormalAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/GenerateAdvancedReportNormalAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/GenerateAdvancedReportNormalAction.java 2011-08-04 08:39:55 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/GenerateAdvancedReportOrgGroupListingAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/GenerateAdvancedReportOrgGroupListingAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/GenerateAdvancedReportOrgGroupListingAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.exporting.advance.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/GenerateAdvancedReportPeriodColumnListingAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/GenerateAdvancedReportPeriodColumnListingAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/GenerateAdvancedReportPeriodColumnListingAction.java 2011-08-04 08:39:55 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/GetExportReportsByGroupAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/GetExportReportsByGroupAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/GetExportReportsByGroupAction.java 2011-08-04 08:39:55 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/GetOrganisationUnitGroupListAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/GetOrganisationUnitGroupListAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/GetOrganisationUnitGroupListAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.exporting.advance.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/SelectAdvancedExportFormAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/SelectAdvancedExportFormAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/SelectAdvancedExportFormAction.java 2011-08-04 08:39:55 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/AddExportItemAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/AddExportItemAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/AddExportItemAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.exportitem.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/CopyExportItemToExportReportAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/CopyExportItemToExportReportAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/CopyExportItemToExportReportAction.java 2011-08-04 08:39:55 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/CopyExportItemToImportReportAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/CopyExportItemToImportReportAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/CopyExportItemToImportReportAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.exportitem.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/DeleteExportItemAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/DeleteExportItemAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/DeleteExportItemAction.java 2011-08-04 08:39:55 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/DeleteMultiExportItemAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/DeleteMultiExportItemAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/DeleteMultiExportItemAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.exportitem.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/GetDataElementCategoryOptionCombosAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/GetDataElementCategoryOptionCombosAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/GetDataElementCategoryOptionCombosAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.exportitem.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -82,13 +82,16 @@
{
ExportReportCategory report = (ExportReportCategory) exportReportService.getExportReport( id );
- DataElementGroupOrder dataElementGroupOrder = report.getDataElementOrders().iterator().next();
-
- DataElement de = dataElementGroupOrder.getDataElements().iterator().next();
-
- dataElementCategoryOptionCombos = new ArrayList<DataElementCategoryOptionCombo>( de.getCategoryCombo()
- .getOptionCombos() );
-
+ if ( report.getDataElementOrders() != null && !report.getDataElementOrders().isEmpty() )
+ {
+ DataElementGroupOrder dataElementGroupOrder = report.getDataElementOrders().iterator().next();
+
+ DataElement de = dataElementGroupOrder.getDataElements().iterator().next();
+
+ dataElementCategoryOptionCombos = new ArrayList<DataElementCategoryOptionCombo>( de.getCategoryCombo()
+ .getOptionCombos() );
+ }
+
return SUCCESS;
}
}
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/GetExportItemAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/GetExportItemAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/GetExportItemAction.java 2011-08-04 08:39:55 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/GetListSheetAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/GetListSheetAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/GetListSheetAction.java 2011-08-04 08:39:55 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/ListExportItemAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/ListExportItemAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/ListExportItemAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.exportitem.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/SetupExportItemFormAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/SetupExportItemFormAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/SetupExportItemFormAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.exportitem.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/UpdateExportItemAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/UpdateExportItemAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/UpdateExportItemAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.exportitem.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportreport/action/AddExportReportAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportreport/action/AddExportReportAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportreport/action/AddExportReportAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.exportreport.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportreport/action/DeleteExportReportAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportreport/action/DeleteExportReportAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportreport/action/DeleteExportReportAction.java 2011-08-04 08:39:55 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportreport/action/GetExportReportGroupsAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportreport/action/GetExportReportGroupsAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportreport/action/GetExportReportGroupsAction.java 2011-08-04 08:39:55 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportreport/action/ListExportReportAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportreport/action/ListExportReportAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportreport/action/ListExportReportAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.exportreport.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportreport/action/OpenExportReportAssociationsAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportreport/action/OpenExportReportAssociationsAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportreport/action/OpenExportReportAssociationsAction.java 2011-08-04 08:39:55 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportreport/action/OpenExportReportUserRoleAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportreport/action/OpenExportReportUserRoleAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportreport/action/OpenExportReportUserRoleAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.exportreport.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportreport/action/UpdateExportReportAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportreport/action/UpdateExportReportAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportreport/action/UpdateExportReportAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.exportreport.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportreport/action/UpdateExportReportAssociationsAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportreport/action/UpdateExportReportAssociationsAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportreport/action/UpdateExportReportAssociationsAction.java 2011-08-04 08:39:55 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportreport/action/UpdateExportReportUserRoleAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportreport/action/UpdateExportReportUserRoleAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportreport/action/UpdateExportReportUserRoleAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.exportreport.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportreport/action/ValidateExportReportAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportreport/action/ValidateExportReportAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportreport/action/ValidateExportReportAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.exportreport.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/filemanager/action/CleanUpDraftFilesAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/filemanager/action/CleanUpDraftFilesAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/filemanager/action/CleanUpDraftFilesAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.filemanager.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/filemanager/action/DeleteExcelTemplateAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/filemanager/action/DeleteExcelTemplateAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/filemanager/action/DeleteExcelTemplateAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.filemanager.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/filemanager/action/DownloadFileAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/filemanager/action/DownloadFileAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/filemanager/action/DownloadFileAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.filemanager.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/filemanager/action/ExcelTemplateListAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/filemanager/action/ExcelTemplateListAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/filemanager/action/ExcelTemplateListAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.filemanager.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/filemanager/action/RenameExcelTemplateAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/filemanager/action/RenameExcelTemplateAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/filemanager/action/RenameExcelTemplateAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.filemanager.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -26,12 +26,13 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import static org.hisp.dhis.reportsheet.utils.FileUtils.rename;
+
import java.io.File;
-import org.hisp.dhis.options.SystemSettingManager;
+import org.hisp.dhis.reportsheet.ReportLocationManager;
import org.hisp.dhis.reportsheet.action.ActionSupport;
import org.hisp.dhis.reportsheet.state.SelectionManager;
-import org.hisp.dhis.reportsheet.utils.FileUtils;
/**
* @author Dang Duy Hieu
@@ -45,13 +46,8 @@
// Dependency
// -------------------------------------------------------------------------
- private SystemSettingManager systemSettingManager;
-
- public void setSystemSettingManager( SystemSettingManager systemSettingManager )
- {
- this.systemSettingManager = systemSettingManager;
- }
-
+ private ReportLocationManager reportLocationManager;
+
private SelectionManager selectionManager;
public void setSelectionManager( SelectionManager selectionManager )
@@ -62,7 +58,7 @@
// -------------------------------------------------------------------------
// Getter && Setter
// -------------------------------------------------------------------------
-
+
private String newFileName;
public void setNewFileName( String newFileName )
@@ -94,21 +90,20 @@
{
message = "";
- String templateDirectory = (String) systemSettingManager
- .getSystemSetting( SystemSettingManager.KEY_REPORT_TEMPLATE_DIRECTORY );
+ File templateDirectory = reportLocationManager.getExportReportTemplateDirectory();
File curFile = new File( templateDirectory + File.separator + curFileName );
File newFile = new File( templateDirectory + File.separator + newFileName );
selectionManager.setRenameFilePath( curFile.getAbsolutePath() );
- if ( FileUtils.rename( curFile, newFile ) )
+ if ( rename( curFile, newFile ) )
{
- message = "rename_successful";
+ message = i18n.getString( "rename_successful" );
}
else
{
- message = "rename_failed";
+ message = i18n.getString( "rename_failed" );
return ERROR;
}
@@ -120,4 +115,9 @@
return SUCCESS;
}
+
+ public void setReportLocationManager( ReportLocationManager reportLocationManager )
+ {
+ this.reportLocationManager = reportLocationManager;
+ }
}
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/filemanager/action/UpdateExportReportByTemplateAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/filemanager/action/UpdateExportReportByTemplateAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/filemanager/action/UpdateExportReportByTemplateAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.filemanager.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/filemanager/action/UploadExcelFileAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/filemanager/action/UploadExcelFileAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/filemanager/action/UploadExcelFileAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.filemanager.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/filemanager/action/ValidateUploadExcelFile.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/filemanager/action/ValidateUploadExcelFile.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/filemanager/action/ValidateUploadExcelFile.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.filemanager.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importing/action/GetImportingParamsAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importing/action/GetImportingParamsAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importing/action/GetImportingParamsAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.importing.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importing/action/GetPeriodsByImportReportAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importing/action/GetPeriodsByImportReportAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importing/action/GetPeriodsByImportReportAction.java 2011-08-04 08:39:55 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importing/action/ImportDataFlowAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importing/action/ImportDataFlowAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importing/action/ImportDataFlowAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.importing.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/AddImportItemAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/AddImportItemAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/AddImportItemAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.importitem.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/CopyImportItemToExportReportAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/CopyImportItemToExportReportAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/CopyImportItemToExportReportAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.importitem.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/CopyImportItemToImportReportAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/CopyImportItemToImportReportAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/CopyImportItemToImportReportAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.importitem.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/DeleteImportItemAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/DeleteImportItemAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/DeleteImportItemAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.importitem.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/GetImportItemParamAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/GetImportItemParamAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/GetImportItemParamAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.importitem.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/GetSelectedDataElementsAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/GetSelectedDataElementsAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/GetSelectedDataElementsAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.importitem.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/ListImportItemAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/ListImportItemAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/ListImportItemAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.importitem.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/SetupImportItemFormAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/SetupImportItemFormAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/SetupImportItemFormAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.importitem.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/UpdateImportItemAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/UpdateImportItemAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/UpdateImportItemAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.importitem.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/UpdateImportItemFormAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/UpdateImportItemFormAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/UpdateImportItemFormAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.importitem.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/ValidateImportItemAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/ValidateImportItemAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/ValidateImportItemAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.importitem.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importreport/action/AddImportReportAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importreport/action/AddImportReportAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importreport/action/AddImportReportAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.importreport.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importreport/action/DeleteImportReportAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importreport/action/DeleteImportReportAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importreport/action/DeleteImportReportAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.importreport.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importreport/action/ListAllImportReportAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importreport/action/ListAllImportReportAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importreport/action/ListAllImportReportAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.importreport.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importreport/action/OpenImportReportAssociationsAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importreport/action/OpenImportReportAssociationsAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importreport/action/OpenImportReportAssociationsAction.java 2011-08-04 08:39:55 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importreport/action/OpenUpdateOrgUnitGroupForCategoryAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importreport/action/OpenUpdateOrgUnitGroupForCategoryAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importreport/action/OpenUpdateOrgUnitGroupForCategoryAction.java 2011-08-04 08:39:55 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importreport/action/UpdateImportReportAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importreport/action/UpdateImportReportAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importreport/action/UpdateImportReportAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.importreport.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importreport/action/UpdateImportReportAssociationsAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importreport/action/UpdateImportReportAssociationsAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importreport/action/UpdateImportReportAssociationsAction.java 2011-08-04 08:39:55 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importreport/action/UpdateOrgUnitGroupAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importreport/action/UpdateOrgUnitGroupAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importreport/action/UpdateOrgUnitGroupAction.java 2011-08-04 08:39:55 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importreport/action/ValidateImportReportAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importreport/action/ValidateImportReportAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importreport/action/ValidateImportReportAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.importreport.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/jchart/action/AddJChartAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/jchart/action/AddJChartAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/jchart/action/AddJChartAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.jchart.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/jchart/action/DeleteJChartAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/jchart/action/DeleteJChartAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/jchart/action/DeleteJChartAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.jchart.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/jchart/action/GetALLJchartAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/jchart/action/GetALLJchartAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/jchart/action/GetALLJchartAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.jchart.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/jchart/action/GetJChartAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/jchart/action/GetJChartAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/jchart/action/GetJChartAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.jchart.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/jchart/action/PrepareDataForAddOrUpdateJChartAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/jchart/action/PrepareDataForAddOrUpdateJChartAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/jchart/action/PrepareDataForAddOrUpdateJChartAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.jchart.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/jchart/action/UpdateJChartAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/jchart/action/UpdateJChartAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/jchart/action/UpdateJChartAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.jchart.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/jchart/action/UpdateJChartUserRoleAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/jchart/action/UpdateJChartUserRoleAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/jchart/action/UpdateJChartUserRoleAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.jchart.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/jchart/action/UpdateJChartUserRoleFormAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/jchart/action/UpdateJChartUserRoleFormAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/jchart/action/UpdateJChartUserRoleFormAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.jchart.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/jchart/action/draw/DrawJChartAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/jchart/action/draw/DrawJChartAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/jchart/action/draw/DrawJChartAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.jchart.action.draw;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/orgunitgrouplisting/action/ListOrgUnitGroupAtLevelAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/orgunitgrouplisting/action/ListOrgUnitGroupAtLevelAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/orgunitgrouplisting/action/ListOrgUnitGroupAtLevelAction.java 2011-08-04 08:39:55 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/orgunitgrouplisting/action/OpenUpdateOrgUnitGroupAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/orgunitgrouplisting/action/OpenUpdateOrgUnitGroupAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/orgunitgrouplisting/action/OpenUpdateOrgUnitGroupAction.java 2011-08-04 08:39:55 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/orgunitgrouplisting/action/UpdateOrgUnitGroupAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/orgunitgrouplisting/action/UpdateOrgUnitGroupAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/orgunitgrouplisting/action/UpdateOrgUnitGroupAction.java 2011-08-04 08:39:55 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/orgunitgrouplisting/action/UpdateOrgUnitGroupAtLevelAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/orgunitgrouplisting/action/UpdateOrgUnitGroupAtLevelAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/orgunitgrouplisting/action/UpdateOrgUnitGroupAtLevelAction.java 2011-08-04 08:39:55 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/period/db/DefaultPeriodDatabaseManager.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/period/db/DefaultPeriodDatabaseManager.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/period/db/DefaultPeriodDatabaseManager.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.period.db;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/period/db/PeriodDatabaseService.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/period/db/PeriodDatabaseService.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/period/db/PeriodDatabaseService.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.period.db;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/period/db/action/GetPeriodsByPeriodTypeAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/period/db/action/GetPeriodsByPeriodTypeAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/period/db/action/GetPeriodsByPeriodTypeAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.period.db.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/period/db/action/NextPeriodsAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/period/db/action/NextPeriodsAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/period/db/action/NextPeriodsAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.period.db.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/period/db/action/PreviousPeriodsAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/period/db/action/PreviousPeriodsAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/period/db/action/PreviousPeriodsAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.period.db.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/period/generic/action/GetPeriodsByPeriodTypeAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/period/generic/action/GetPeriodsByPeriodTypeAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/period/generic/action/GetPeriodsByPeriodTypeAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.period.generic.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/period/generic/action/NextPeriodsAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/period/generic/action/NextPeriodsAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/period/generic/action/NextPeriodsAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.period.generic.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/period/generic/action/PreviousPeriodsAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/period/generic/action/PreviousPeriodsAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/period/generic/action/PreviousPeriodsAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.period.generic.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/periodcolumn/action/DeletePeriodColumnAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/periodcolumn/action/DeletePeriodColumnAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/periodcolumn/action/DeletePeriodColumnAction.java 2011-08-04 08:39:55 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/periodcolumn/action/GetPeriodColumnAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/periodcolumn/action/GetPeriodColumnAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/periodcolumn/action/GetPeriodColumnAction.java 2011-08-04 08:39:55 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/periodcolumn/action/SavePeriodColumnAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/periodcolumn/action/SavePeriodColumnAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/periodcolumn/action/SavePeriodColumnAction.java 2011-08-04 08:39:55 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/periodcolumn/action/UpdatePeriodColumnAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/periodcolumn/action/UpdatePeriodColumnAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/periodcolumn/action/UpdatePeriodColumnAction.java 2011-08-04 08:39:55 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/preview/action/ExportXMLAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/preview/action/ExportXMLAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/preview/action/ExportXMLAction.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.preview.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/preview/action/XMLStructureResponse.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/preview/action/XMLStructureResponse.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/preview/action/XMLStructureResponse.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.preview.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/preview/action/XMLStructureResponseImport.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/preview/action/XMLStructureResponseImport.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/preview/action/XMLStructureResponseImport.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.preview.action;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/preview/manager/DefaultInitializePOIStylesManager.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/preview/manager/DefaultInitializePOIStylesManager.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/preview/manager/DefaultInitializePOIStylesManager.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.preview.manager;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/preview/manager/InitializePOIStylesManager.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/preview/manager/InitializePOIStylesManager.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/preview/manager/InitializePOIStylesManager.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.preview.manager;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/state/DefaultSelectionManager.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/state/DefaultSelectionManager.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/state/DefaultSelectionManager.java 2011-08-04 08:39:55 +0000
@@ -1,6 +1,6 @@
package org.hisp.dhis.reportsheet.state;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/state/SelectionManager.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/state/SelectionManager.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/state/SelectionManager.java 2011-08-04 08:39:55 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/utils/DateUtils.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/utils/DateUtils.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/utils/DateUtils.java 2011-08-04 08:39:55 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/utils/ExcelFileFilter.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/utils/ExcelFileFilter.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/utils/ExcelFileFilter.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.utils;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/utils/ExpressionUtils.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/utils/ExpressionUtils.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/utils/ExpressionUtils.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.utils;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/utils/FileUtils.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/utils/FileUtils.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/utils/FileUtils.java 2011-08-04 08:39:55 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.reportsheet.utils;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/utils/StringUtils.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/utils/StringUtils.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/utils/StringUtils.java 2011-08-04 08:39:55 +0000
@@ -4,7 +4,7 @@
import java.text.NumberFormat;
/*
- * Copyright (c) 2004-2010, University of Oslo
+ * Copyright (c) 2004-2011, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/resources/META-INF/dhis/beans.xml'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/resources/META-INF/dhis/beans.xml 2011-08-03 08:38:38 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/resources/META-INF/dhis/beans.xml 2011-08-04 08:39:55 +0000
@@ -1327,9 +1327,10 @@
id="org.hisp.dhis.reportsheet.filemanager.action.RenameExcelTemplateAction"
class="org.hisp.dhis.reportsheet.filemanager.action.RenameExcelTemplateAction"
scope="prototype">
- <property name="systemSettingManager" ref="org.hisp.dhis.options.SystemSettingManager" />
<property name="selectionManager"
ref="org.hisp.dhis.reportsheet.state.SelectionManager" />
+ <property name="reportLocationManager"
+ ref="org.hisp.dhis.reportsheet.ReportLocationManager" />
</bean>
<bean
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/resources/org/hisp/dhis/reportsheet/i18n_module.properties'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/resources/org/hisp/dhis/reportsheet/i18n_module.properties 2011-08-03 08:38:38 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/resources/org/hisp/dhis/reportsheet/i18n_module.properties 2011-08-04 08:39:55 +0000
@@ -293,4 +293,6 @@
select_sheet_for_filter = Select sheet for filter
remove_item = Remove item
file_format_structure_broken= Warning! File format structure is broken.
-number_of_members = Number of members
\ No newline at end of file
+number_of_members = Number of members
+edit_excel_template = Edit name of excel template
+no_group_order_created_for_category = No group order created for this category report
\ No newline at end of file
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/resources/org/hisp/dhis/reportsheet/i18n_module_vi_VN.properties'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/resources/org/hisp/dhis/reportsheet/i18n_module_vi_VN.properties 2011-08-03 08:38:38 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/resources/org/hisp/dhis/reportsheet/i18n_module_vi_VN.properties 2011-08-04 08:39:55 +0000
@@ -672,4 +672,6 @@
override_confirm =B\u1ea3ng m\u1eabu \u0111\u00e3 t\u1ed3n t\u1ea1i. B\u1ea1n c\u00f3 mu\u1ed1n ghi \u0111\u00e8 hay kh\u00f4ng ?
formula_is_invalid =Bi\u1ec3u th\u1ee9c kh\u00f4ng h\u1ee3p l\u1ec7 \!
file_format_structure_broken=C\u1ea3nh b\u00e1o! C\u1ea5u tr\u00fac \u0111\u1ecbnh d\u1ea1ng t\u1eadp tin kh\u00f4ng b\u1ecb ph\u00e1 v\u1ee1.
-number_of_members =S\u1ed1 ph\u1ea7n t\u1eed trong nh\u00f3m
\ No newline at end of file
+number_of_members =S\u1ed1 ph\u1ea7n t\u1eed trong nh\u00f3m
+edit_excel_template =Ch\u1ec9nh s\u1eeda t\u00ean t\u1eadp tin
+no_group_order_created_for_category = Kh\u00f4ng c\u00f3 nh\u00f3m ph\u1ea7n t\u1eed th\u1ee9 t\u1ef1 \u0111\u01b0\u1ee3c t\u1ea1o cho lo\u1ea1i b\u00e1o c\u00e1o n\u00e0y
\ No newline at end of file
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/resources/struts.xml'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/resources/struts.xml 2011-08-03 08:38:38 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/resources/struts.xml 2011-08-04 08:39:55 +0000
@@ -798,7 +798,6 @@
class="org.hisp.dhis.reportsheet.importreport.action.SetupImportReportFormAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-spreadsheet-reporting/import/addImportReport.vm</param>
- <param name="javascripts">javascript/importReports.js</param>
<param name="requiredAuthorities">F_EXCEL_REPORT_ADMINISTRATION</param>
</action>
@@ -825,9 +824,7 @@
<param name="page">/dhis-web-spreadsheet-reporting/import/importReports.vm</param>
<param name="menu">/dhis-web-spreadsheet-reporting/menu.vm</param>
<param name="menuTreeHeight">220</param>
- <param name="javascripts">
- javascript/importReports.js,
- ../dhis-web-commons/ouwt/ouwt.js</param>
+ <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js</param>
</action>
<action name="getAllImportReport"
@@ -846,7 +843,6 @@
class="org.hisp.dhis.reportsheet.importreport.action.SetupImportReportFormAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-spreadsheet-reporting/import/updateImportReport.vm</param>
- <param name="javascripts">javascript/importReports.js</param>
<param name="requiredAuthorities">F_EXCEL_REPORT_ADMINISTRATION</param>
</action>
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/excelTemplateList.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/excelTemplateList.vm 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/excelTemplateList.vm 2011-08-04 08:39:55 +0000
@@ -67,18 +67,18 @@
</tbody>
</table>
-<div id="editExcelTemplateDiv" style="position:fixed;display:none;width:444px;z-index:11;background-color: white;border: medium solid silver;height:60px;padding:20px">
- <div id="close" style="position:absolute;top:2px;right:2px;cursor: pointer;color:red;" onclick="hidePopupWindow('editExcelTemplateDiv');hideMessage();">[x]</div>
+<div id="editExcelTemplateDiv">
<input type="hidden" value="" id="currentFileNameHidden"/>
<table>
<tr>
<td><label>$i18n.getString('name')<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="newName" style="width:20em" name="T1" size="20" onkeyup="javascript: validateRenamingExcelTemplate(this.value ,1);"/></td>
+ <td><input type="text" id="newName" style="width:20em" name="T1" size="20" onkeyup="javascript: validateRenamingExcelTemplate(this.value ,1);"/></td>
<td><input type="button" value="$i18n.getString('rename')" id="excelTemplateButtonRename" disabled="disabled" onclick="javascript: checkingStatusExcelTemplate(document.getElementById('newName').value, 1, 2);"/></td>
- <td><input type="button" value="$i18n.getString('cancel')" onclick="hidePopupWindow('editExcelTemplateDiv');hideMessage();"/></td>
+ <td><input type="button" value="$i18n.getString('cancel')" onclick="closeDialog( dialog );hideMessage();"/></td>
</tr>
</table>
</div>
+
<span id="message" style="top:100px;right:5px;position:fixed;width:300px;z-index:10002" onclick="javascript:hideById(this.id);"></span>
<script language="javascript">
@@ -98,6 +98,8 @@
var confirmRenamingMessage = i18n_file_used_system + '\n' + i18n_confirm_rename;
var confirmUpdateSysMessage = i18n_rename_successful + '\n' + i18n_confirm_update_system;
+ var dialog = setUpDialog( 'editExcelTemplateDiv', '$i18n.getString( "edit_excel_template" )', 444, 60 );
+
#if ( $message )
#if ( $newFileUploadedOrRenamed )
$(document).ready( function() {
@@ -106,5 +108,4 @@
#end
#end
-</script>
-<span id="message" style="top:100px;right:5px;position:fixed;width:200px;z-index:10002" onclick="hideById(this.id);"></span>
+</script>
\ No newline at end of file
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/exceltemplate.js'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/exceltemplate.js 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/exceltemplate.js 2011-08-04 08:39:55 +0000
@@ -2,14 +2,40 @@
// EXCEL TEMPLATE MANAGER
// ========================================================================================================================
-//----------------------------------------------------------
+// ---------------------------------------------------------------------------
// Regular Expression using for checking excel's file name
-//----------------------------------------------------------
-
-//regPattern = /^[^0-9\s\W][a-zA-Z_. 0-9]{5,50}\.xl(?:sx|s)$/;
-// or :
+// ---------------------------------------------------------------------------
regPattern = /^[a-zA-Z][\w\s\d.]{5,50}\.xl(?:sx|s)$/;
+// ---------------------------------------------------------------------------
+// Dialog
+// ---------------------------------------------------------------------------
+
+function setUpDialog( elementId, title, width, height )
+{
+ var dialog = jQuery( '#'+elementId ).dialog({
+ title: title,
+ modal: true,
+ autoOpen: false,
+ minWidth: width,
+ minHeight: height,
+ width: width,
+ height: height
+ });
+
+ return dialog;
+}
+
+function openDialog( _dialog )
+{
+ _dialog.dialog( 'open' );
+}
+
+function closeDialog( _dialog )
+{
+ _dialog.dialog( 'close' );
+}
+
/*
* Delete Excel Template
*/
@@ -41,14 +67,20 @@
curTemplateName = '';
newTemplateName = '';
-function openEditExcelTemplate( currentFileName ) {
-
+function openEditExcelTemplate( currentFileName )
+{
curTemplateName = currentFileName;
- $("#editExcelTemplateDiv").showAtCenter( true );
-}
-
-function validateRenamingExcelTemplate( fileName, columnIndex ) {
-
+ setFieldValue( "newName", currentFileName );
+ openDialog( dialog );
+}
+
+function applyingPatternForFileName( fileName )
+{
+ return fileName.match( regPattern );
+}
+
+function validateRenamingExcelTemplate( fileName, columnIndex )
+{
var list = byId( 'list' );
var rows = list.getElementsByTagName( 'tr' );
@@ -82,19 +114,13 @@
}
}
-function applyingPatternForFileName( fileName ) {
-
- return fileName.match( regPattern );
-}
-
/**
param renamingMode::
'RUS': Rename file name and update the system
'RNUS': Rename file name but non-updating the system
*/
-
-function checkingStatusExcelTemplate( newFileName, keyColumnIndex, statusColumnIndex ) {
-
+function checkingStatusExcelTemplate( newFileName, keyColumnIndex, statusColumnIndex )
+{
var list = byId( 'list' );
var rows = list.getElementsByTagName( 'tr' );
var flagRename = false;
@@ -114,17 +140,11 @@
{
renamingExcelTemplate( curTemplateName, newFileName, "RUS" );
}
- else
- {
- hideById('editExcelTemplateDiv');
- deleteDivEffect();
- }
+ else closeDialog( dialog );
+
return;
}
- else
- {
- flagRename = true;
- }
+ else flagRename = true;
}
// File exists and pending
@@ -132,16 +152,17 @@
{
renamingExcelTemplate( curTemplateName, newFileName, "RNUS" );
}
-
}
-function renamingExcelTemplate( curFileName, newFileName, renamingMode ) {
-
+function renamingExcelTemplate( curFileName, newFileName, renamingMode )
+{
var request = new Request();
request.setResponseTypeXML( 'xmlObject' );
request.setCallbackSuccess( renamingExcelTemplateReceived );
- request.send( "renameExcelTemplate.action?newFileName=" + newFileName + "&curFileName=" + curFileName + "&renamingMode=" + renamingMode );
+ var params = "newFileName=" + newFileName + "&curFileName=" + curFileName + "&renamingMode=" + renamingMode;
+ request.sendAsPost( params );
+ request.send( "renameExcelTemplate.action" );
}
function renamingExcelTemplateReceived( xmlObject ) {
@@ -151,38 +172,33 @@
if ( type == "success" )
{
- hideById('editExcelTemplateDiv');
- deleteDivEffect();
+ closeDialog( dialog );
if ( window.confirm( confirmUpdateSysMessage ) )
{
- //alert("update_system");
- updateReportExcelByTemplate();
+ updateExportReportByTemplate();
}
else
{
window.location.href="listAllExcelTemplates.action?mode=" + mode + "&message=" + message;
}
}
- else if ( type == "none" )
+ else if ( type == "input" )
{
window.location.href="listAllExcelTemplates.action?mode=" + mode + "&message=" + message;
}
- else
- {
- setMessage( message );
- }
+ else setMessage( message );
}
-function updateReportExcelByTemplate() {
+function updateExportReportByTemplate() {
var request = new Request();
request.setResponseTypeXML( 'xmlObject' );
- request.setCallbackSuccess( updateReportExcelByTemplateCompleted );
- request.send( "updateReportExcelByTemplate.action?curTemplateName=" + curTemplateName + "&newTemplateName=" + newTemplateName);
+ request.setCallbackSuccess( updateExportReportByTemplateCompleted );
+ request.send( "updateExportReportByTemplate.action?curTemplateName=" + curTemplateName + "&newTemplateName=" + newTemplateName);
}
-function updateReportExcelByTemplateCompleted( xmlObject ) {
+function updateExportReportByTemplateCompleted( xmlObject ) {
var type = xmlObject.getAttribute( 'type' );
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/exportItems.js'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/exportItems.js 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/exportItems.js 2011-08-04 08:39:55 +0000
@@ -337,8 +337,8 @@
* COPY SELECTED EXPORT_ITEM(s) TO IMPORT_REPORT
*/
-function copyExportItemToImportReport() {
-
+function copyExportItemToImportReport()
+{
var request = new Request();
request.setResponseTypeXML( 'xmlObject' );
request.setCallbackSuccess( copyExportItemToImportReportReceived );
@@ -469,7 +469,7 @@
}
function executeCopyItems( url )
-{
+{
$.postJSON(
url, {}, function ( json )
{
@@ -487,83 +487,10 @@
}
/**
-* Open dataelement expression
-*/
-function openDataElementExpression() {
-
- byId( "formula" ).value = byId( "expression" ).value;
-
- getALLDataElementGroup();
- getDataElementsByGroup();
- enable("dataElementGroup");
- enable("availableDataElements");
- byId("availableDataElements").onchange = function(e){ getOptionCombos() };
- if(mode=='update'){
- updateFormulaText( 'formula' );
- }
-
- $("#normal").showAtCenter( true );
-}
-
-/**
-* Get All dataelement group
-*/
-
-function getALLDataElementGroup() {
-
- var list = byId('dataElementGroup');
-
- list.options.length = 0;
- list.add( new Option( "ALL", "ALL" ), null );
-
- for ( id in dataElementGroups )
- {
- list.add( new Option( dataElementGroups[id], id ), null );
- }
-}
-
-/**
-* Get DataElements By Group
-*/
-
-function getDataElementsByGroup( )
-{
- var dataElementGroupId = $("#dataElementGroup").val();
- var url = "../dhis-web-commons-ajax/getDataElements.action?id=" + $("#dataElementGroup").val();
-
- var request = new Request();
- request.setResponseTypeXML( 'xmlObject' );
- request.setCallbackSuccess( getDataElementsByGroupCompleted );
- request.send( url );
-}
-
-function getDataElementsByGroupCompleted( xmlObject ){
-
- var dataElementList = byId( "availableDataElements" );
-
- dataElementList.options.length = 0;
-
- var dataelements = xmlObject.getElementsByTagName( "dataElement" );
-
- for ( var i = 0; i < dataelements.length; i++)
- {
- var id = dataelements[ i ].getElementsByTagName( "id" )[0].firstChild.nodeValue;
- var elementName = dataelements[ i ].getElementsByTagName( "name" )[0].firstChild.nodeValue;
-
- var option = new Option( elementName, id );
- option.onmousemove = function(e){
- showToolTip( e, this.text);
- }
- dataElementList.add( option, null );
- }
-}
-
-
-/**
* Indicator Export item type
*/
-function openIndicatorExpression() {
-
+function openIndicatorExpression()
+{
byId("formulaIndicator").value = byId("expression").value;
getIndicatorGroups();
@@ -575,8 +502,8 @@
$("#indicatorForm").show();
}
-function getIndicatorGroups() {
-
+function getIndicatorGroups()
+{
var list = byId('indicatorGroups');
list.options.length = 0;
@@ -589,16 +516,16 @@
}
}
-function filterIndicators() {
-
+function filterIndicators()
+{
var request = new Request();
request.setResponseTypeXML( 'xmlObject' );
request.setCallbackSuccess( filterIndicatorsCompleted );
request.send( "../dhis-web-commons-ajax/getIndicators.action?id=" + $("#indicatorGroups").val());
}
-function filterIndicatorsCompleted( xmlObject ) {
-
+function filterIndicatorsCompleted( xmlObject )
+{
var indiatorList = byId( "availableIndicators" );
indiatorList.options.length = 0;
@@ -625,15 +552,14 @@
/**
* Open Category Expression
*/
-function openCategoryExpression() {
-
+function openCategoryExpression()
+{
byId("categoryFormula").value = byId("expression").value;
var request = new Request();
request.setResponseTypeXML( 'xmlObject' );
request.setCallbackSuccess( openCategoryExpressionReceived );
- request.send("getExportReport.action?id=" + exportReportId);
-
+ request.send("getExportReport.action?id=" + exportReportId);
}
function openCategoryExpressionReceived( data ) {
@@ -664,46 +590,12 @@
$( "#category" ).show();
}
-
-/**
-* Get DataElement Group Order
-*/
-
-function getDataElementGroupOrder() {
-
- var request = new Request();
- request.setResponseTypeXML( 'xmlObject' );
- request.setCallbackSuccess( getDataElementGroupOrderReceived );
- request.send( "getDataElementGroupOrder.action?id=" + $("#dataElementGroup_").val() );
-
-}
-
-function getDataElementGroupOrderReceived( data ) {
-
- var availableDataElements = byId('availableDataElements_');
- availableDataElements.options.length = 0;
- var dataelEments = data.getElementsByTagName( "dataElement" );
-
- for ( var i = 0; i < dataelEments.length; i++ )
- {
- var id = dataelEments[ i ].getElementsByTagName( "id" )[0].firstChild.nodeValue;
- var name = dataelEments[ i ].getElementsByTagName( "name" )[0].firstChild.nodeValue;
- //availableDataElements.options.add(new Option(name, id));
- var option = new Option( name, id );
- option.onmousemove = function(e){
- showToolTip( e, this.text);
- }
- availableDataElements.add(option, null);
- }
-}
-
-function getOptionCombos_() {
-
+function getOptionCombos_()
+{
var request = new Request();
request.setResponseTypeXML( 'xmlObject' );
request.setCallbackSuccess( getOptionCombos_Received );
- request.send( "getOptionCombos.action?dataElementId=" + byId("availableDataElements_").value );
-
+ request.send( "getOptionCombos.action?dataElementId=" + byId("availableDataElements_").value );
}
function getOptionCombos_Received( xmlObject ) {
@@ -726,15 +618,16 @@
}
}
-function insertDataElementId_() {
-
+function insertDataElementId_()
+{
var optionCombo = byId("optionCombos_");
var dataElementComboId = "[*." + optionCombo.value + "]";
byId("categoryFormula").value = dataElementComboId;
byId("categoryFormulaDiv").innerHTML = "*." + optionCombo[optionCombo.selectedIndex].text ;
}
-function clearFormula(formulaFieldName){
+function clearFormula(formulaFieldName)
+{
byId(formulaFieldName).value = '';
byId(formulaFieldName + "Div").innerHTML = ''
}
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/exportReports.js'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/exportReports.js 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/exportReports.js 2011-08-04 08:39:55 +0000
@@ -1,106 +1,5 @@
-//=========================================
-// EXPORT REPORT CATEGORY ACTION
-//=========================================
-
-/*
-* Open Add DataElement Group
-*/
-
-function openAddDataElementGroups( id ) {
-
- exportReportId = id;
- getALLDataElementGroups();
-}
-
-/*
-* Get ALL DataElement Group
-*/
-
-function getALLDataElementGroups() {
-
- var request = new Request();
- request.setResponseTypeXML( 'datalement' );
- request.setCallbackSuccess( getALLDataElementGroupsReceived );
- request.send( "getAllDataElementGroups.action" );
-
-}
-
-function getALLDataElementGroupsReceived( data ) {
-
- var availableDataElementGroups = document.getElementById('availableDataElementGroups');
- availableDataElementGroups.options.length = 0;
- var dataElementGroups = data.getElementsByTagName('dataElementGroups')[0].getElementsByTagName('dataElementGroup');
-
- for( var i = 0 ; i < dataElementGroups.length ; i++ ) {
-
- var id = dataElementGroups.item(i).getElementsByTagName('id')[0].firstChild.nodeValue;
- var name = dataElementGroups.item(i).getElementsByTagName('name')[0].firstChild.nodeValue;
- availableDataElementGroups.options.add(new Option(name, id));
- }
- getReportDataElementGroups(exportReportId);
-}
-/*
-* Get DataElement Order of Export Report
-*/
-
-function getExportReportDataElementGroups( id ) {
-
- var request = new Request();
- request.setResponseTypeXML( 'xmlObject' );
- request.setCallbackSuccess( getExportReportDataElementGroupsReceived );
- request.send( "getExportReport.action?id=" + id );
-
-}
-
-function getExportReportDataElementGroupsReceived( data ) {
-
- var selectedDataElementGroups = document.getElementById('selectedDataElementGroups');
- selectedDataElementGroups.options.length = 0;
- var dataElementGroups = data.getElementsByTagName('dataElementGroups')[0].getElementsByTagName('dataElementGroup');
-
- for( var i = 0 ; i < dataElementGroups.length ; i++ ) {
-
- var id = dataElementGroups.item(i).getElementsByTagName('dataElementGroupId')[0].firstChild.nodeValue;
- var name = dataElementGroups.item(i).getElementsByTagName('name')[0].firstChild.nodeValue;
- selectedDataElementGroups.options.add(new Option(name, id));
- }
-
- var availableDataElementGroups = document.getElementById('availableDataElementGroups');
- var selectedDataElementGroups = document.getElementById('selectedDataElementGroups');
-
- for ( var i = 0 ; i < availableDataElementGroups.options.length ; i++ ) {
-
- for ( var j = 0 ; j < selectedDataElementGroups.options.length ; j++ ) {
-
- if ( availableDataElementGroups.options[i].value == selectedDataElementGroups.options[j].value ) {
-
- availableDataElementGroups.options[i] = null;
- }
- }
- }
- showPopupWindowById( "dataElementGroups", 550, 270 );
-}
-
-/*
-* Update Data Element Group Order
-*/
-
-function updateDataElementGroupOrder() {
-
- var url = "updateDataElementGroupOrder.action?exportReportId=" + exportReportId;
- var selectedDataElementGroups = document.getElementById('selectedDataElementGroups').options;
-
- for( var i = 0 ; i < selectedDataElementGroups.length ; i++ ) {
-
- url += "&dataElementGroupsId=" + selectedDataElementGroups[i].value
- }
-
- window.location = url;
-}
-
-
-function backupExportReport( id ) {
-
+function backupExportReport( id )
+{
var request = new Request();
request.setResponseTypeXML( 'xmlObject' );
request.setCallbackSuccess( backupExportReportReceived );
=== removed file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/importReports.js'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/importReports.js 2011-08-03 08:38:38 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/importReports.js 1970-01-01 00:00:00 +0000
@@ -1,99 +0,0 @@
-// ========================================================================================================================
-// IMPORT REPORT
-// ========================================================================================================================
-
-// --------------------------------------------------------------------
-// DATA ELEMENT GROUP
-// --------------------------------------------------------------------
-
-/*
-* Open Add Data Element Group Order
-*/
-function openAddDataElementGroupOrder() {
-
- getALLDataElementGroups();
- document.forms['dataElementGroups'].action = "addDataElementGroupOrderForCategory.action";
-}
-/*
-* Get Data Elements By Data Element Group
-*/
-function getDataElementsByGroup( id ) {
-
- if ( id == null )
- {
- return;
- }
-
- var url = "../dhis-web-commons-ajax/getDataElements.action?id=" + id;
-
- var request = new Request();
- request.setResponseTypeXML( 'datalement' );
- request.setCallbackSuccess( getDataElementsByGroupReceived );
- request.send( url );
-}
-
-function getDataElementsByGroupReceived( datalement ) {
-
- var dataElements = datalement.getElementsByTagName( "dataElement" );
-
- var listDataElement = document.getElementById('availableDataElements');
-
- listDataElement.options.length = 0;
-
- for ( var i = 0; i < dataElements.length; i++ )
- {
- var id = dataElements[ i ].getElementsByTagName( "id" )[0].firstChild.nodeValue;
- var name = dataElements[ i ].getElementsByTagName( "name" )[0].firstChild.nodeValue;
- var option = new Option( name, id );
-
- option.onmousemove = function( e ) {
-
- showToolTip( e, this.text );
- }
-
- listDataElement.add( option, null );
- }
-
- var availableDataElements = document.getElementById('availableDataElements');
- var dataElementIds = document.getElementById('dataElementIds');
-
- for( var i = 0 ; i < availableDataElements.options.length ; i++ ) {
- for ( var j = 0 ; j < dataElementIds.options.length ; j++ ) {
- if ( availableDataElements.options[i].value == dataElementIds.options[j].value ) {
- availableDataElements.options[i].style.display='none';
- }
- }
- }
-
- $("#dataElementGroups").showAtCenter( true );
-}
-
-function getALLDataElementGroups() {
-
- var request = new Request();
- request.setResponseTypeXML( 'datalement' );
- request.setCallbackSuccess( getALLDataElementGroupsReceived );
- request.send( "getAllDataElementGroups.action" );
-
-}
-
-function getALLDataElementGroupsReceived( data ) {
-
- var availableDataElementGroups = document.getElementById('availableDataElementGroups');
- availableDataElementGroups.options.length = 0;
-
- var dataElementGroups = data.getElementsByTagName('dataElementGroup');
- availableDataElementGroups.options.add(new Option("ALL", null));
-
- for( var i = 0 ; i < dataElementGroups.length ; i++ ) {
-
- var id = dataElementGroups.item(i).getElementsByTagName('id')[0].firstChild.nodeValue;
- var name = dataElementGroups.item(i).getElementsByTagName('name')[0].firstChild.nodeValue;
-
- var option = new Option( name, id );
- availableDataElementGroups.add(option, null);
- }
-
- getDataElementsByGroup( getFieldValue("availableDataElementGroups") );
-}
-
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/report/dataelementExpressionBuilderForm.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/report/dataelementExpressionBuilderForm.vm 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/report/dataelementExpressionBuilderForm.vm 2011-08-04 08:39:55 +0000
@@ -16,6 +16,7 @@
var deExpressionValidator = null;
var deExpressionDialog = null;
+ var i18n_no_group_order_created_for_category = '$encoder.jsEscape( $i18n.getString( "no_group_order_created_for_category" ) , "'")';;
</script>
@@ -24,8 +25,8 @@
<table width="100%">
<tr>
<th>$i18n.getString( "formula" )</th>
- <th>$i18n.getString( "dataelement" )</th>
- <tr>
+ <th id="dataElementGroupOrderHeader">$i18n.getString( "dataelement" )</th>
+ </tr>
<tr valign="top">
<td height="139">
<textarea id="formula" name="expression" cols="40" rows="5" class="{validate:{required:true}}"></textarea><br>
@@ -74,10 +75,10 @@
function deExpressionBuilderForm()
{
- #if ( $exportReport.isCategory() )
+ #if ( $exportReport.isCategory() )
getDataElementCategoryOptionCombos();
#else
- dataDictionary.loadDataElementGroups("#dataelement select[id=groupSelect]") ;
+ dataDictionary.loadDataElementGroups("#dataelement select[id=groupSelect]") ;
#end
setFieldValue( 'dataelement textarea[id=formula]', getFieldValue('expression') );
@@ -87,9 +88,9 @@
function getDataElements( id, target )
{
- #if($exportReport.isCategory())
+ #if($exportReport.isCategory())
dataDictionary.loadDataElementsByGroup( id, target);
- #else
+ #else
dataDictionary.loadOperands( target, {id:id} );
#end
}
@@ -103,9 +104,17 @@
{
jQuery.postJSON('getDataElementCategoryOptionCombos.action'
, {id:$exportReport.id}
- , function( json ){
+ , function( json )
+ {
var select = jQuery("#dataelement select[id=elementSelect]");
select.empty();
+
+ if ( json.dataElementCategoryOptionCombos.length == 0 )
+ {
+ setInnerHTML( 'dataElementGroupOrderHeader', "<i style='color:red'>"+i18n_no_group_order_created_for_category+"</i>" );
+ return;
+ }
+
jQuery.each( json.dataElementCategoryOptionCombos, function(i, item ){
select.append( "<option value='" + item.id + "'>" + item.name + "</option>" );
});
