dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #07322
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2072: Minor fix.
------------------------------------------------------------
revno: 2072
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Mon 2010-09-06 20:09:10 +0700
message:
Minor fix.
modified:
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitemgroup/action/OpenExcelItemGroupAssociationsAction.java
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/action/GenerateReportOrganizationGroupListingAction.java
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importing/action/ImportDataExcelOrganizationGroupAction.java
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module.properties
--
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 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitemgroup/action/OpenExcelItemGroupAssociationsAction.java'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitemgroup/action/OpenExcelItemGroupAssociationsAction.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitemgroup/action/OpenExcelItemGroupAssociationsAction.java 2010-09-06 13:09:10 +0000
@@ -41,67 +41,73 @@
* @version $Id$
*/
-public class OpenExcelItemGroupAssociationsAction implements Action {
-
- // -------------------------------------------
- // Dependencies
- // -------------------------------------------
-
- private ExcelItemService excelItemService;
-
- private SelectionTreeManager selectionTreeManager;
-
- private OrganisationUnitService organisationUnitService;
-
- // -------------------------------------------
- // Input & Output
- // -------------------------------------------
-
- private Integer excelItemGroupId;
-
- private ExcelItemGroup excelItemGroup;
-
- private List<OrganisationUnitLevel> levels;
-
- // -------------------------------------------
- // Getter & Setter
- // -------------------------------------------
-
- public void setOrganisationUnitService(
- OrganisationUnitService organisationUnitService) {
- this.organisationUnitService = organisationUnitService;
- }
-
- public void setSelectionTreeManager(
- SelectionTreeManager selectionTreeManager) {
- this.selectionTreeManager = selectionTreeManager;
- }
-
- public List<OrganisationUnitLevel> getLevels() {
- return levels;
- }
-
- public ExcelItemGroup getExcelItemGroup() {
- return excelItemGroup;
- }
-
- public void setExcelItemService(ExcelItemService excelItemService) {
- this.excelItemService = excelItemService;
- }
-
- public void setExcelItemGroupId(Integer excelItemGroupId) {
- this.excelItemGroupId = excelItemGroupId;
- }
-
- public String execute() throws Exception {
-
- excelItemGroup = excelItemService.getExcelItemGroup(excelItemGroupId);
-
- selectionTreeManager.setSelectedOrganisationUnits(excelItemGroup
- .getOrganisationAssocitions());
-
- levels = organisationUnitService.getOrganisationUnitLevels();
-
- return SUCCESS;
- }
+public class OpenExcelItemGroupAssociationsAction
+ implements Action
+{
+ // -------------------------------------------
+ // Dependencies
+ // -------------------------------------------
+
+ private ExcelItemService excelItemService;
+
+ private SelectionTreeManager selectionTreeManager;
+
+ private OrganisationUnitService organisationUnitService;
+
+ // -------------------------------------------
+ // Input & Output
+ // -------------------------------------------
+
+ private Integer excelItemGroupId;
+
+ private ExcelItemGroup excelItemGroup;
+
+ private List<OrganisationUnitLevel> levels;
+
+ // -------------------------------------------
+ // Getter & Setter
+ // -------------------------------------------
+
+ public void setOrganisationUnitService( OrganisationUnitService organisationUnitService )
+ {
+ this.organisationUnitService = organisationUnitService;
+ }
+
+ public void setSelectionTreeManager( SelectionTreeManager selectionTreeManager )
+ {
+ this.selectionTreeManager = selectionTreeManager;
+ }
+
+ public List<OrganisationUnitLevel> getLevels()
+ {
+ return levels;
+ }
+
+ public ExcelItemGroup getExcelItemGroup()
+ {
+ return excelItemGroup;
+ }
+
+ public void setExcelItemService( ExcelItemService excelItemService )
+ {
+ this.excelItemService = excelItemService;
+ }
+
+ public void setExcelItemGroupId( Integer excelItemGroupId )
+ {
+ this.excelItemGroupId = excelItemGroupId;
+ }
+
+ public String execute()
+ throws Exception
+ {
+
+ excelItemGroup = excelItemService.getExcelItemGroup( excelItemGroupId );
+
+ selectionTreeManager.setSelectedOrganisationUnits( excelItemGroup.getOrganisationAssocitions() );
+
+ levels = organisationUnitService.getOrganisationUnitLevels();
+
+ return SUCCESS;
+ }
}
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/action/GenerateReportOrganizationGroupListingAction.java'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/action/GenerateReportOrganizationGroupListingAction.java 2010-09-06 09:12:16 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/action/GenerateReportOrganizationGroupListingAction.java 2010-09-06 13:09:10 +0000
@@ -122,7 +122,6 @@
String totalFormula = "SUM(";
-
for ( OrganisationUnitGroup organisationUnitGroup : reportExcel.getOrganisationUnitGroups() )
{
@@ -146,7 +145,6 @@
}
else
{
-
organisationUnits.retainAll( childrenOrganisationUnits );
}
@@ -223,7 +221,7 @@
if ( reportItem.getItemType().equalsIgnoreCase( ReportExcelItem.TYPE.DATAELEMENT ))
{
totalFormula = totalFormula.substring( 0, totalFormula.length() - 1 ) + ")";
- System.out.println("\n\n\n ++++++++++++++ \n totalFormula : " + totalFormula);
+
ExcelUtils.writeFormulaByPOI( firstRow, reportItem.getColumn(), totalFormula, sheet, this.csFormula );
}
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importing/action/ImportDataExcelOrganizationGroupAction.java'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importing/action/ImportDataExcelOrganizationGroupAction.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importing/action/ImportDataExcelOrganizationGroupAction.java 2010-09-06 13:09:10 +0000
@@ -60,7 +60,6 @@
public class ImportDataExcelOrganizationGroupAction
extends ActionSupport
{
-
// --------------------------------------------------------------------
// Dependencies
// --------------------------------------------------------------------
@@ -188,9 +187,7 @@
if ( exelItem.getId() == excelItemId )
{
-
writeDataValue( exelItem, wb, row, o, period );
-
}// end if( exelItem ...
}// end for (int i ...
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module.properties 2010-09-05 14:39:24 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module.properties 2010-09-06 13:09:10 +0000
@@ -207,7 +207,7 @@
file_type_not_supported = File type not supported
override_confirm = File is exist. Do you want to override ?
ready_in_use = File is ready in use. Can not delete !
-intro_configuration = Set the path to the directory only store files excel template. For example: C:\\ABC
+intro_configuration = Set the path to the directory only store files excel template. For example: C:\ABC for Windows or home/ABC for Linux.
intro_reports = Create, update, view and delete the excel report. A report excel containing many report items. Excel report can in a variety of different reports. Excel report for assignment to one or more units or group units and options list.
intro_data_status = This function is used to view the status input of data (Data is entered or not done or any missing one, etc. ..).
intro_clean_up = This feature allows users to delete the temporary files generated during the generating report or previewing report.
