midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-6052 Print Format: Format Pattern is not Applied on Grouping/Summary SCRIPT rows (#2252)

This commit is contained in:
Carlos Ruiz 2024-02-28 04:25:12 +01:00
parent 4f3c18730d
commit 7ff0f2f2b9
1 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
org.adempiere.base/src/org/compiere/print/DataEngine.java
View File

@ -24,6 +24,8 @@ import java.sql.ResultSet;
import java.sql.ResultSetMetaData; import java.sql.ResultSetMetaData;
import java.sql.SQLException; import java.sql.SQLException;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
@ -443,7 +445,8 @@ public class DataEngine
// Warning here: Oracle treats empty strings '' as NULL and the code below checks for wasNull on this column // Warning here: Oracle treats empty strings '' as NULL and the code below checks for wasNull on this column
.append("' '").append(" AS \"").append(pfiName).append("\","); .append("' '").append(" AS \"").append(pfiName).append("\",");
// //
pdc = new PrintDataColumn(AD_PrintFormatItem_ID, -1, pfiName, DisplayType.Text, FieldLength, orderName, isPageBreak); int scriptDisplayType = getDisplayTypeFromPattern(formatPattern);
pdc = new PrintDataColumn(AD_PrintFormatItem_ID, -1, pfiName, scriptDisplayType, FieldLength, orderName, isPageBreak);
synonymNext(); synonymNext();
} }
// -- Parent, TableDir (and unqualified Search) -- // -- Parent, TableDir (and unqualified Search) --
@ -805,6 +808,31 @@ public class DataEngine
return pd; return pd;
} // getPrintDataInfo } // getPrintDataInfo
/**
* Try to determine the display type from a pattern
* - try a DecimalFormat if the pattern contains any of the characters # 0
* - try a SimpleDateFormat if the pattern contains any of the characters y M d h H m s S
* - otherwise (or if the format is not valid) return Text
* @param pattern
* @return DateTime for a SimpleDateFormat, Number for a DecimalFormat, otherwise Text
*/
private int getDisplayTypeFromPattern(String pattern) {
if (! Util.isEmpty(pattern, true)) {
if (pattern.matches(".*[#0].*")) {
try {
new DecimalFormat(pattern);
return DisplayType.Number;
} catch (Exception ex) {}
} else if (pattern.matches(".*[yMdhHmsS].*")) {
try {
new SimpleDateFormat(pattern);
return DisplayType.DateTime;
} catch (Exception ex) {}
}
}
return DisplayType.Text;
}
/** /**
* Next Synonym. * Next Synonym.
* Creates next synonym A..Z AA..ZZ AAA..ZZZ * Creates next synonym A..Z AA..ZZ AAA..ZZZ