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

hg merge release-2.0 (merge release2 into development)

This commit is contained in:
Carlos Ruiz 2014-07-11 21:27:33 -05:00
parent b07963f20c 402fa7e782
commit 023a9a19ac
6 changed files with 109 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
org.adempiere.base/src/org/adempiere/impexp/GridTabCSVExporter.java
View File

@ -265,7 +265,13 @@ public class GridTabCSVExporter implements IGridTabExporter
if (record_id!=null)
sValue = queryExecute(columnRef,tableRef,record_id);
}else{
sValue = address.get_Value(columnName);
sValue = address.get_Value(columnName);
if (DisplayType.YesNo == MColumn.get(Env.getCtx(), MLocation.Table_Name, columnName).getAD_Reference_ID()) {
if (sValue != null && (Boolean) sValue)
sValue = "Y";
else if (sValue != null && ! (Boolean) sValue)
sValue = "N";
}
}
row.put(gridTab.getTableName()+">"+specialHeader,sValue);
idxfld++;
@ -384,7 +390,13 @@ public class GridTabCSVExporter implements IGridTabExporter
if(record_id!=null)
sValue = queryExecute(columnRef,tableRef,record_id);
}else{
sValue = address.get_Value(columnName);
sValue = address.get_Value(columnName);
if (DisplayType.YesNo == MColumn.get(Env.getCtx(), MLocation.Table_Name, columnName).getAD_Reference_ID()) {
if (sValue != null && (Boolean) sValue)
sValue = "Y";
else if (sValue != null && ! (Boolean) sValue)
sValue = "N";
}
}
row.put(childTab.getTableName()+">"+specialHeader,sValue);
}

4
org.adempiere.base/src/org/compiere/model/GridTab.java
View File

@ -929,13 +929,13 @@ public class GridTab implements DataStatusListener, Evaluatee, Serializable
if (keyNo != -1 || uuid != null)
{
if ( ( keyNo != -1 && keyNo != m_mTable.getKeyID(m_currentRow) )
|| ( uuid != null && uuid.compareTo(m_mTable.getUUID(m_currentRow)) != 0) ) // something changed
|| (uuid != null && m_mTable.getUUID(m_currentRow) == null) || ( uuid != null && uuid.compareTo(m_mTable.getUUID(m_currentRow)) != 0) ) // something changed
{
int size = getRowCount();
for (int i = 0; i < size; i++)
{
if ( ( keyNo != -1 && keyNo == m_mTable.getKeyID(i) )
|| ( uuid != null && uuid.compareTo(m_mTable.getUUID(i)) == 0) )
|| ( uuid != null && m_mTable.getUUID(i) != null && uuid.compareTo(m_mTable.getUUID(i)) == 0) )
{
m_currentRow = i;
break;

3
org.adempiere.base/src/org/compiere/model/MSysConfig.java
View File

@ -42,7 +42,7 @@ public class MSysConfig extends X_AD_SysConfig
/**
*
*/
private static final long serialVersionUID = 7850399904723862767L;
private static final long serialVersionUID = -4635791167798916808L;
public static final String ADDRESS_SAVE_REQUEST_RESPONSE_LOG = "ADDRESS_SAVE_REQUEST_RESPONSE_LOG";
public static final String ADDRESS_VALIDATION = "ADDRESS_VALIDATION";
@ -126,6 +126,7 @@ public class MSysConfig extends X_AD_SysConfig
public static final String ZK_BROWSER_TITLE = "ZK_BROWSER_TITLE";
public static final String ZK_BUTTON_STYLE = "ZK_BUTTON_STYLE";
public static final String ZK_DASHBOARD_REFRESH_INTERVAL = "ZK_DASHBOARD_REFRESH_INTERVAL";
public static final String ZK_DECIMALBOX_PROCESS_DOTKEYPAD = "ZK_DECIMALBOX_PROCESS_DOTKEYPAD";
public static final String ZK_DESKTOP_CLASS = "ZK_DESKTOP_CLASS";
public static final String ZK_GRID_EDIT_MODELESS = "ZK_GRID_EDIT_MODELESS";
public static final String ZK_LOGIN_ALLOW_REMEMBER_ME = "ZK_LOGIN_ALLOW_REMEMBER_ME";

65
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/NumberBox.java
View File

@ -23,6 +23,7 @@ import java.text.ParseException;
import org.adempiere.webui.LayoutUtils;
import org.adempiere.webui.theme.ThemeManager;
import org.compiere.model.MSysConfig;
import org.compiere.util.DisplayType;
import org.compiere.util.Env;
import org.zkoss.zk.ui.Page;
@ -47,7 +48,7 @@ public class NumberBox extends Div
/**
*
*/
private static final long serialVersionUID = -3548087521669052891L;
private static final long serialVersionUID = 8543853599051754172L;
private Textbox txtCalc = new Textbox();
@ -84,7 +85,40 @@ public class NumberBox extends Div
decimalBox.setStyle("display: inline-block;text-align:right");
decimalBox.setHflex("0");
decimalBox.setSclass("editor-input");
appendChild(decimalBox);
decimalBox.setId(decimalBox.getUuid());
char separatorChar = DisplayType.getNumberFormat(DisplayType.Number, Env.getLanguage(Env.getCtx())).getDecimalFormatSymbols().getDecimalSeparator();
String separator = Character.toString(separatorChar);
boolean processDotKeypad = MSysConfig.getBooleanValue(MSysConfig.ZK_DECIMALBOX_PROCESS_DOTKEYPAD, true, Env.getAD_Client_ID(Env.getCtx()));
if (".".equals(separator))
processDotKeypad = false;
if (processDotKeypad) {
StringBuffer funct = new StringBuffer();
funct.append("function(evt)");
funct.append("{");
// ignore dot and process it on key up
funct.append(" if (!this._shallIgnore(evt, '0123456789-%").append(separator).append("'))");
funct.append(" {");
funct.append(" this.$doKeyPress_(evt);");
funct.append(" }");
funct.append("}");
decimalBox.setWidgetOverride("doKeyPress_", funct.toString());
funct = new StringBuffer();
// not working correctly on opera
funct.append("if (window.event)");
funct.append(" key = event.keyCode;");
funct.append("else");
funct.append(" key = event.which;");
funct.append("if ((key == 110 || key == 190) && !window.opera) {");
funct.append(" var id = '$'.concat('").append(decimalBox.getId()).append("');");
funct.append(" var calcText = jq(id)[0];");
funct.append(" calcText.value += '").append(separator).append("';");
funct.append(" event.stop;");
funct.append("};");
decimalBox.setWidgetListener("onKeyUp", funct.toString());
}
appendChild(decimalBox);
btn = new Button();
btn.setImage(ThemeManager.getThemeResource("images/Calculator16.png"));
@ -197,13 +231,35 @@ public class NumberBox extends Div
Vbox vbox = new Vbox();
char separatorChar = DisplayType.getNumberFormat(DisplayType.Number, Env.getLanguage(Env.getCtx())).getDecimalFormatSymbols().getDecimalSeparator();
String separator = Character.toString(separatorChar);
txtCalc = new Textbox();
decimalBox.setId(decimalBox.getUuid());
txtCalc.setId(txtCalc.getUuid());
txtCalc.setWidgetListener("onKeyUp", "return calc.validate('" +
boolean processDotKeypad = MSysConfig.getBooleanValue(MSysConfig.ZK_DECIMALBOX_PROCESS_DOTKEYPAD, true, Env.getAD_Client_ID(Env.getCtx()));
if (".".equals(separator))
processDotKeypad = false;
// restrict allowed characters
String decimalSep = separator;
if (!processDotKeypad && !".".equals(separator))
decimalSep += ".";
StringBuffer funct = new StringBuffer();
funct.append("function(evt)");
funct.append("{");
funct.append(" if (!this._shallIgnore(evt, '= -/()*%+0123456789").append(decimalSep).append("'))");
funct.append(" {");
funct.append(" this.$doKeyPress_(evt);");
funct.append(" }");
funct.append("}");
txtCalc.setWidgetOverride("doKeyPress_", funct.toString());
txtCalc.setWidgetListener("onKeyUp", "calc.validateUp('" +
decimalBox.getId() + "','" + txtCalc.getId()
+ "'," + integral + "," + (int)separatorChar + ", event, " + ( processDotKeypad ? "true" : "false" ) + ");");
txtCalc.setWidgetListener("onKeyPress", "calc.validatePress('" +
decimalBox.getId() + "','" + txtCalc.getId()
+ "'," + integral + "," + (int)separatorChar + ", event);");
txtCalc.setMaxlength(250);
@ -323,7 +379,6 @@ public class NumberBox extends Div
btn0.setLabel("0");
btn0.setWidgetListener("onClick", "calc.append('" + txtCalcId + "', '0')");
String separator = Character.toString(separatorChar);
Button btnDot = new Button();
btnDot.setWidth("30px");
btnDot.setLabel(separator);

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAccountEditor.java
View File

@ -80,6 +80,8 @@ public class WAccountEditor extends WEditor implements ContextMenuListener
@Override
public Object getValue()
{
//if (m_mAccount.C_ValidCombination_ID == 0)
// return null;
return new Integer (m_mAccount.C_ValidCombination_ID);
}

63
org.adempiere.ui.zk/js/calc.js
View File

@ -1,13 +1,14 @@
function Calc()
{
this.validate = validate;
this.validateUp = validateUp;
this.validatePress = validatePress;
this.clear = clear;
this.clearAll = clearAll;
this.evaluate = evaluate;
this.append = append;
function validate(displayTextId, calcTextId, integral, separatorKey, e)
function validatePress(displayTextId, calcTextId, integral, separatorKey, e)
{
var key;
@ -15,43 +16,29 @@ function Calc()
key = e.keyCode; //IE
else
key = e.which; //Firefox
if(key == 13 || key == 61) // Enter, =
// console.log("validatePress: " + displayTextId + " / " + calcTextId + " / " + integral + " / " + separatorKey + " / " + key);
if (key == 61) // =
{
evaluate(displayTextId, calcTextId, String.fromCharCode(separatorKey));
return false;
}
else if (key == 0) // control, delete, ...
{
return true;
}
else if (key == 8) // backspace
{
return true;
}
else if (key >= 17 && key <= 20) // Control
{
return true;
}
else if (key == 32) // space
{
return true;
}
else if (key >= 48 && key <= 57) // 0 - 9
{
return true;
}
else if (key == 42 || key == 43 || key == 45 || key == 47) // *, +, -, /
{
return true;
}
else if ( key == separatorKey && !integral)
{
return true;
}
}
function validateUp(displayTextId, calcTextId, integral, separatorKey, e, processDotKeypad)
{
var key;
if(window.event)
key = e.keyCode; //IE
else
key = e.which; //Firefox
// console.log("validateUp: " + displayTextId + " / " + calcTextId + " / " + integral + " / " + separatorKey + " / " + key + " / " + processDotKeypad);
if (key == 13) // Enter
{
return false;
evaluate(displayTextId, calcTextId, String.fromCharCode(separatorKey));
}
else if (processDotKeypad && separatorKey != 46 && (key == 110 || key == 190) && !window.opera) // numeric dot on keypad (not working for opera)
{
append(calcTextId, String.fromCharCode(separatorKey));
e.stop;
}
}
@ -89,6 +76,8 @@ function Calc()
function evaluate(displayTextId, calcTextId, separator)
{
// console.log("evaluate: " + displayTextId + " / " + calcTextId + " / " + separator);
var newValue = "error";
try
{
var id = "$".concat(calcTextId);
@ -99,6 +88,11 @@ function Calc()
var re = new RegExp("[" + separator + "]", "g");
value = value.replace(re,'.');
}
var reclean = new RegExp("[^1234567890+-/*%() ]", "g"); // sanitize
value = value.replace(reclean,'');
var reperc = new RegExp("[%]", "g"); // percentage
value = value.replace(reperc,'/100 ');
newValue = value;
var result = "" + eval(value);
if (separator != '.')
{
@ -117,6 +111,7 @@ function Calc()
}
catch (err)
{
calcText.value = newValue;
}
}