dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #18194
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 7577: local vn - Minor fixed.
------------------------------------------------------------
revno: 7577
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-07-11 15:56:27 +0700
message:
local vn - Minor fixed.
modified:
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GenerateReportAttributeAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GenerateReportCategoryAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GenerateReportNormalAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GenerateReportPeriodColumnListingAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GenerateReportVerticalCategoryAction.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GenerateReportAttributeAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GenerateReportAttributeAction.java 2012-05-12 16:01:40 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GenerateReportAttributeAction.java 2012-07-11 08:56:27 +0000
@@ -71,15 +71,22 @@
DataElementCategoryOptionCombo defaultOptionCombo = categoryService.getDefaultDataElementCategoryOptionCombo();
+ Collection<ExportItem> exportReportItems = null;
+
for ( Integer sheetNo : exportReportService.getSheets( selectionManager.getSelectedReportId() ) )
{
Sheet sheet = this.templateWorkbook.getSheetAt( sheetNo - 1 );
- Collection<ExportItem> exportReportItems = exportReportInstance.getExportItemBySheet( sheetNo );
+ exportReportItems = exportReportInstance.getExportItemBySheet( sheetNo );
this.generateOutPutFile( defaultOptionCombo, exportReportInstance, exportReportItems, organisationUnit,
sheet );
}
+
+ /**
+ * Garbage
+ */
+ exportReportItems = null;
}
// -------------------------------------------------------------------------
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GenerateReportCategoryAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GenerateReportCategoryAction.java 2012-05-04 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GenerateReportCategoryAction.java 2012-07-11 08:56:27 +0000
@@ -59,11 +59,13 @@
this.installReadTemplateFile( exportReportInstance, period, organisationUnit );
+ Collection<ExportItem> exportReportItems = null;
+
for ( Integer sheetNo : exportReportService.getSheets( selectionManager.getSelectedReportId() ) )
{
Sheet sheet = this.templateWorkbook.getSheetAt( sheetNo - 1 );
- Collection<ExportItem> exportReportItems = exportReportInstance.getExportItemBySheet( sheetNo );
+ exportReportItems = exportReportInstance.getExportItemBySheet( sheetNo );
if ( isVerticalCategory( exportReportItems ) )
{
@@ -74,6 +76,11 @@
this.generateHorizontalOutPutFile( exportReportInstance, exportReportItems, organisationUnit, sheet );
}
}
+
+ /**
+ * Garbage
+ */
+ exportReportItems = null;
}
// -------------------------------------------------------------------------
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GenerateReportNormalAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GenerateReportNormalAction.java 2012-05-04 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GenerateReportNormalAction.java 2012-07-11 08:56:27 +0000
@@ -57,14 +57,21 @@
this.installReadTemplateFile( exportReportInstance, period, organisationUnit );
+ Collection<ExportItem> exportReportItems = null;
+
for ( Integer sheetNo : exportReportService.getSheets( selectionManager.getSelectedReportId() ) )
{
Sheet sheet = this.templateWorkbook.getSheetAt( sheetNo - 1 );
- Collection<ExportItem> exportReportItems = exportReportInstance.getExportItemBySheet( sheetNo );
+ exportReportItems = exportReportInstance.getExportItemBySheet( sheetNo );
this.generateOutPutFile( exportReportItems, organisationUnit, sheet );
}
+
+ /**
+ * Garbage
+ */
+ exportReportItems = null;
}
// -------------------------------------------------------------------------
@@ -87,8 +94,8 @@
{
String value = getTextValue( reportItem, organisationUnit );
- ExcelUtils.writeValueByPOI( reportItem.getRow(), reportItem.getColumn(), value, ExcelUtils.TEXT,
- sheet, this.csText );
+ ExcelUtils.writeValueByPOI( reportItem.getRow(), reportItem.getColumn(), value, ExcelUtils.TEXT, sheet,
+ this.csText );
}
else if ( reportItem.getItemType().equalsIgnoreCase( ExportItem.TYPE.INDICATOR ) )
{
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GenerateReportPeriodColumnListingAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GenerateReportPeriodColumnListingAction.java 2012-06-07 06:25:18 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GenerateReportPeriodColumnListingAction.java 2012-07-11 08:56:27 +0000
@@ -61,15 +61,22 @@
this.installReadTemplateFile( exportReportInstance, period, organisationUnit );
+ Collection<ExportItem> exportReportItems = null;
+
for ( Integer sheetNo : exportReportService.getSheets( selectionManager.getSelectedReportId() ) )
{
Sheet sheet = this.templateWorkbook.getSheetAt( sheetNo - 1 );
- Collection<ExportItem> exportReportItems = exportReportInstance.getExportItemBySheet( sheetNo );
+ exportReportItems = exportReportInstance.getExportItemBySheet( sheetNo );
this.generateOutPutFile( exportReportInstance.getPeriodColumns(), exportReportItems, organisationUnit,
sheet );
}
+
+ /**
+ * Garbage
+ */
+ exportReportItems = null;
}
// -------------------------------------------------------------------------
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GenerateReportVerticalCategoryAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GenerateReportVerticalCategoryAction.java 2012-06-13 06:57:31 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GenerateReportVerticalCategoryAction.java 2012-07-11 08:56:27 +0000
@@ -64,14 +64,21 @@
this.installReadTemplateFile( exportReportInstance, period, unit );
+ Collection<ExportItem> exportReportItems = null;
+
for ( Integer sheetNo : exportReportService.getSheets( selectionManager.getSelectedReportId() ) )
{
Sheet sheet = this.templateWorkbook.getSheetAt( sheetNo - 1 );
- Collection<ExportItem> exportReportItems = exportReportInstance.getExportItemBySheet( sheetNo );
+ exportReportItems = exportReportInstance.getExportItemBySheet( sheetNo );
this.generateVerticalOutPutFile( exportReportInstance, exportReportItems, unit, sheet );
}
+
+ /**
+ * Garbage
+ */
+ exportReportItems = null;
}
// -------------------------------------------------------------------------
