dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #03154
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1046: Removed the un-used code and some modification
------------------------------------------------------------
revno: 1046
committer: hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Wed 2009-11-18 12:27:27 +0700
message:
Removed the un-used code and some modification
modified:
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/action/GenerateReportExcelFlowAction.java
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/preview/advance/action/GeneratePreviewAdvancedCategoryAction.java
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/utils/ExcelUtils.java
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/export.js
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportparams.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 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/action/GenerateReportExcelFlowAction.java'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/action/GenerateReportExcelFlowAction.java 2009-11-13 10:28:52 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/action/GenerateReportExcelFlowAction.java 2009-11-18 05:27:27 +0000
@@ -60,10 +60,6 @@
private Integer periodId;
- //private Integer sheetId;
-
- //private Integer orgunitGroupId;
-
// -------------------------------------------
// Getter & Setter
// -------------------------------------------
@@ -93,27 +89,10 @@
this.reportService = reportService;
}
-// public Integer getSheetId()
-// {
-// return sheetId;
-//
-// }
-//
-// public void setSheetId( Integer sheetId )
-// {
-// this.sheetId = sheetId;
-// }
-//
-// public Integer getOrgunitGroupId()
-// {
-// return orgunitGroupId;
-// }
-//
-// public void setOrgunitGroupId( Integer orgunitGroupId )
-// {
-// this.orgunitGroupId = orgunitGroupId;
-// }
-
+ // -------------------------------------------
+ // Action implementation
+ // -------------------------------------------
+
public String execute()
throws Exception
{
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/preview/advance/action/GeneratePreviewAdvancedCategoryAction.java'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/preview/advance/action/GeneratePreviewAdvancedCategoryAction.java 2009-11-13 10:28:52 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/preview/advance/action/GeneratePreviewAdvancedCategoryAction.java 2009-11-18 05:27:27 +0000
@@ -41,9 +41,7 @@
import org.hisp.dhis.reportexcel.DataElementGroupOrder;
import org.hisp.dhis.reportexcel.ReportExcelCategory;
import org.hisp.dhis.reportexcel.ReportExcelItem;
-import org.hisp.dhis.reportexcel.period.db.PeriodDatabaseService;
import org.hisp.dhis.reportexcel.preview.action.GeneratePreviewReportExcelSupport;
-import org.hisp.dhis.reportexcel.state.SelectionManager;
import org.hisp.dhis.reportexcel.utils.ExcelUtils;
/**
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/utils/ExcelUtils.java'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/utils/ExcelUtils.java 2009-11-18 04:14:34 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/utils/ExcelUtils.java 2009-11-18 05:27:27 +0000
@@ -210,12 +210,6 @@
public static String readValuePOI( int row, int column, HSSFSheet sheet )
{
-
- HSSFRow rowPOI = sheet.getRow( row - 1 );
-
- HSSFCell cell = rowPOI.getCell( column - 1 );
-
- return String.valueOf( cell.getNumericCellValue() );
-
+ return String.valueOf( sheet.getRow( row - 1 ).getCell( column - 1 ).getNumericCellValue() );
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/struts.xml 2009-11-18 04:14:34 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/struts.xml 2009-11-18 05:27:27 +0000
@@ -619,14 +619,6 @@
<!-- PREVIEW REPORT EXCEL ACTION -->
- <action name="validateGenerateReport"
- class="org.hisp.dhis.reportexcel.export.action.ValidateGenerateReportAction">
- <result name="success" type="velocity-xml">
- /dhis-web-excel-reporting/responseSuccess.vm</result>
- <result name="error" type="velocity-xml">
- /dhis-web-excel-reporting/responseError.vm</result>
- </action>
-
<action name="openPreviewReport"
class="org.hisp.dhis.reportexcel.preview.action.OpenPreviewReportAction">
<result name="success" type="velocity">/popup.vm</result>
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/export.js'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/export.js 2009-11-13 10:28:52 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/export.js 2009-11-18 05:27:27 +0000
@@ -106,37 +106,6 @@
}
-generic_type = '';
-
-function validateGenerateReport(message) {
-
- setMessage(message);
-
- $.post("validateGenerateReport.action", {
- reportId:$("#report").val(),
- periodId:$("#period").val()
- }, function ( xmlObject ) {
- xmlObject = xmlObject.getElementsByTagName( 'message' )[0];
- var type = xmlObject.getAttribute( 'type' );
-
- if ( type == 'error' )
- {
- setMessage( xmlObject.firstChild.nodeValue );
- }
- else
- {
- if ( generic_type == 'preview' ) {
-
- openPreviewReport();
- }
- else {
- generateReportExcel();
- }
- }
- }, "xml");
-}
-
-
function openPreviewReport() {
var url = "openPreviewReport.action?reportId=" + $('#report').val() + "&periodId=" + $('#period').val() + "&sheetId=1";
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportparams.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportparams.vm 2009-11-13 10:28:52 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportparams.vm 2009-11-18 05:27:27 +0000
@@ -50,7 +50,7 @@
<br>
<hr>
<p>
-<input type="button" value='$i18n.getString( "preview_report" )' onclick="javascript: generic_type = 'preview'; openPreviewReport();" #if(!$organisationUnit) disabled #end/>
+<input type="button" value='$i18n.getString( "preview_report" )' onclick="javascript: openPreviewReport();" #if(!$organisationUnit) disabled #end/>
<input name="generate_report" id="generate_report" type="button" onClick="generateReportExcel()" value='$i18n.getString( "generate_report" )' #if(!$organisationUnit) disabled #end/>
