details: /erp/devel/pi/rev/ae5c327c567f
changeset: 10571:ae5c327c567f
user: Martin Taal <martin.taal <at> openbravo.com>
date: Fri Feb 11 14:10:55 2011 +0100
summary: Added default column size computation
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-grid-styles.js
| 16 ++++++++++
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/ForeignKeyUIDefinition.java
| 11 +++++-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/StringUIDefinition.java
| 12 ++++++-
3 files changed, 34 insertions(+), 5 deletions(-)
diffs (70 lines):
diff -r 5a042c7ac2c6 -r ae5c327c567f
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-grid-styles.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-grid-styles.js
Fri Feb 11 13:22:28 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-grid-styles.js
Fri Feb 11 14:10:55 2011 +0100
@@ -56,6 +56,22 @@
}
});
+isc.OBGrid.addClassProperties({
+
+ defaultColumnWidths: [50, 50, 100],
+
+ getDefaultColumnWidth: function(length) {
+ if (length <= 1) {
+ return isc.OBViewGrid.defaultColumnWidths[0];
+ } else if (length <= 30) {
+ return isc.OBViewGrid.defaultColumnWidths[1];
+ } else if (length <= 60) {
+ return isc.OBViewGrid.defaultColumnWidths[2];
+ }
+ return 200;
+ }
+});
+
isc.OBGrid.changeDefaults('filterEditorDefaults', {
height: 22,
styleName: 'OBGridFilterBase',
diff -r 5a042c7ac2c6 -r ae5c327c567f
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/ForeignKeyUIDefinition.java
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/ForeignKeyUIDefinition.java
Fri Feb 11 13:22:28 2011 +0100
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/ForeignKeyUIDefinition.java
Fri Feb 11 14:10:55 2011 +0100
@@ -52,10 +52,15 @@
@Override
public String getGridFieldProperties(Field field) {
+ Long length = field.getDisplayedLength();
+ if (length == null || length == 0) {
+ length = field.getColumn().getLength();
+ }
final Property prop =
KernelUtils.getInstance().getPropertyFromColumn(field.getColumn());
- return ", width: 200, displayField: '" + prop.getName() + "." +
JsonConstants.IDENTIFIER + "',"
- + "valueField: '" + prop.getName() + "'" + ", foreignKeyField: true"
- + super.getGridFieldProperties(field) +
getShowHoverGridFieldSettings(field);
+ return ", width: isc.OBGrid.getDefaultColumnWidth(" + length + "),
displayField: '"
+ + prop.getName() + "." + JsonConstants.IDENTIFIER + "'," +
"valueField: '" + prop.getName()
+ + "'" + ", foreignKeyField: true" + super.getGridFieldProperties(field)
+ + getShowHoverGridFieldSettings(field);
}
protected String getSuperGridFieldProperties(Field field) {
diff -r 5a042c7ac2c6 -r ae5c327c567f
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/StringUIDefinition.java
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/StringUIDefinition.java
Fri Feb 11 13:22:28 2011 +0100
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/StringUIDefinition.java
Fri Feb 11 14:10:55 2011 +0100
@@ -39,8 +39,16 @@
@Override
public String getGridFieldProperties(Field field) {
- return getShowHoverGridFieldSettings(field) + ", width: 200 "
- + super.getGridFieldProperties(field);
+ Long length = field.getDisplayedLength();
+ if (length == null || length == 0) {
+ length = field.getColumn().getLength();
+ }
+ // custom override
+ if (field.getColumn().getDBColumnName().compareToIgnoreCase("documentno")
== 0) {
+ length = new Long(20);
+ }
+ return getShowHoverGridFieldSettings(field) + ", width:
isc.OBGrid.getDefaultColumnWidth("
+ + length + ")" + super.getGridFieldProperties(field);
}
@Override
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
