=== modified file 'local/vn/dhis-web-spreadsheet-reporting/pom.xml'
--- local/vn/dhis-web-spreadsheet-reporting/pom.xml 2012-11-26 09:12:15 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/pom.xml 2012-12-13 08:59:31 +0000
@@ -69,7 +69,8 @@
org.apache.poi
poi
- 3.5-FINAL
+
+ 3.9
@@ -77,13 +78,15 @@
org.apache.poi
poi-ooxml
- 3.5-FINAL
+
+ 3.9
org.apache.poi
poi-scratchpad
- 3.5-FINAL
+
+ 3.9
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/ValidationFormulaAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/ValidationFormulaAction.java 2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/ValidationFormulaAction.java 2012-12-13 08:59:31 +0000
@@ -49,7 +49,6 @@
this.formula = formula;
}
-
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/utils/ExcelUtils.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/utils/ExcelUtils.java 2012-12-12 09:34:51 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/utils/ExcelUtils.java 2012-12-13 08:59:31 +0000
@@ -48,6 +48,7 @@
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.formula.FormulaParser;
import org.apache.poi.ss.formula.FormulaParsingWorkbook;
+import org.apache.poi.ss.formula.FormulaType;
import org.apache.poi.ss.usermodel.CellStyle;
import org.apache.poi.ss.usermodel.DataFormatter;
import org.apache.poi.ss.usermodel.DateUtil;
@@ -615,15 +616,30 @@
{
try
{
- FormulaParser.parse( formula, evaluationWorkbook );
- }
- catch ( Exception e )
- {
- return false;
- }
-
- return true;
- }
+ FormulaParser.parse( formula, evaluationWorkbook, FormulaType.CELL, -1 );
+ }
+ catch ( Exception e )
+ {
+ return false;
+ }
+
+ return true;
+ }
+
+ public static boolean isValidFormula( String formula, int formulaType, int sheetIndex )
+ {
+ try
+ {
+ FormulaParser.parse( formula, evaluationWorkbook, formulaType, sheetIndex );
+ }
+ catch ( Exception e )
+ {
+ return false;
+ }
+
+ return true;
+ }
+
// -------------------------------------------------------------------------
// Supportive methods
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/menu.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/menu.vm 2012-12-12 05:14:59 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/menu.vm 2012-12-13 08:59:31 +0000
@@ -20,9 +20,9 @@
$i18n.getString( "import" )
-
+
\ No newline at end of file