details: /erp/devel/pi/rev/6f4dfc2109e2
changeset: 11147:6f4dfc2109e2
user: Martin Taal <martin.taal <at> openbravo.com>
date: Wed Mar 09 09:09:14 2011 -0600
summary: Let the user enter date times in own timezone
details: /erp/devel/pi/rev/261b599428c3
changeset: 11148:261b599428c3
user: Martin Taal <martin.taal <at> openbravo.com>
date: Wed Mar 09 09:09:35 2011 -0600
summary: Solve errors in use as filter
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-utilities-date.js
| 21 ++-------
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
| 17 +++++--
2 files changed, 17 insertions(+), 21 deletions(-)
diffs (64 lines):
diff -r e1c0ba4f475e -r 261b599428c3
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-utilities-date.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-utilities-date.js
Wed Mar 09 08:38:21 2011 -0600
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-utilities-date.js
Wed Mar 09 09:09:35 2011 -0600
@@ -139,21 +139,12 @@
}
JSDate.setFullYear(year);
}
- if (dateFormat.indexOf('%H') !== -1) {
- JSDate.setUTCMonth(month - 1);
- JSDate.setUTCDate(day);
- JSDate.setUTCHours(hours);
- JSDate.setUTCMinutes(minutes);
- JSDate.setUTCSeconds(seconds);
- JSDate.setUTCMilliseconds(0);
- } else {
- JSDate.setMonth(month - 1);
- JSDate.setDate(day);
- JSDate.setHours(hours);
- JSDate.setMinutes(minutes);
- JSDate.setSeconds(seconds);
- JSDate.setMilliseconds(0);
- }
+ JSDate.setMonth(month - 1);
+ JSDate.setDate(day);
+ JSDate.setHours(hours);
+ JSDate.setMinutes(minutes);
+ JSDate.setSeconds(seconds);
+ JSDate.setMilliseconds(0);
if (JSDate.toString() === 'Invalid Date' || JSDate.toString() === 'NaN') {
return null;
} else {
diff -r e1c0ba4f475e -r 261b599428c3
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
Wed Mar 09 08:38:21 2011 -0600
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
Wed Mar 09 09:09:35 2011 -0600
@@ -934,18 +934,23 @@
title: OB.I18N.getLabel('OBUIAPP_UseAsFilter'),
click: function(){
var value;
- var filterCriteria = grid.getCriteria();
// a foreign key field, use the displayfield/identifier
if (field.foreignKeyField && field.displayField) {
value = record[field.displayField];
- filterCriteria[field.displayField] = value;
} else {
value = grid.getEditDisplayValue(rowNum, colNum, record);
- filterCriteria[field.name] = value;
}
- grid.setCriteria(filterCriteria);
- grid.checkShowFilterFunnelIcon(grid.getCriteria());
- grid.filterData(grid.getCriteria());
+ // assume a date range filter item
+ if (isc.isA.Date(value) && field.filterEditorType ===
'OBMiniDateRangeItem') {
+ value = {
+ start: value,
+ end: value
+ };
+ }
+ grid.filterEditor.getEditForm().setValue(field.name, value);
+ var criteria = grid.filterEditor.getEditForm().getValuesAsCriteria();
+ grid.checkShowFilterFunnelIcon(criteria);
+ grid.filterData(criteria);
}
});
}
------------------------------------------------------------------------------
Colocation vs. Managed Hosting
A question and answer guide to determining the best fit
for your organization - today and in the future.
http://p.sf.net/sfu/internap-sfd2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
