details: https://code.openbravo.com/erp/devel/pi/rev/0b5e6502cd76
changeset: 16813:0b5e6502cd76
user: Miguel de Juana <miguel.dejuana <at> openbravo.com>
date: Wed May 23 10:55:08 2012 +0200
summary: Fixed issue 20496: Process Monitor in Form view, startTime for all
timezones
In Process Monitor window, When we open Form view, the StartTime field was
wrong in some timezones. Now it works well.
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js
| 7 ++-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/DateTimeUIDefinition.java
| 17 +++++++++-
2 files changed, 21 insertions(+), 3 deletions(-)
diffs (77 lines):
diff -r 487d0f5b997e -r 0b5e6502cd76
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js
Tue Jun 12 15:51:15 2012 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js
Wed May 23 10:55:08 2012 +0200
@@ -950,7 +950,7 @@
var typeInstance;
var assignValue;
var assignClassicValue;
- var isDate, i, valueMap = {},
+ var isDate, isDateTime, i, valueMap = {},
oldValue, field = this.getFieldFromColumnName(columnName),
entries = columnValue.entries;
// not a field on the form, probably a datasource field
@@ -1003,9 +1003,12 @@
// note: do not use clearvalue as this removes the value from the form
this.setValue(field.name, null);
} else if (columnValue.value || columnValue.value === 0 ||
columnValue.value === false) {
- isDate = field.type && (isc.SimpleType.getType(field.type).inheritsFrom
=== 'date' || isc.SimpleType.getType(field.type).inheritsFrom === 'datetime' ||
isc.SimpleType.getType(field.type).inheritsFrom === 'time');
+ isDate = field.type && (isc.SimpleType.getType(field.type).inheritsFrom
=== 'date' || isc.SimpleType.getType(field.type).inheritsFrom === 'time');
+ isDateTime = field.type &&
isc.SimpleType.getType(field.type).inheritsFrom === 'datetime';
if (isDate) {
this.setItemValue(field.name,
isc.Date.parseSchemaDate(columnValue.value));
+ } else if (isDateTime) {
+ this.setItemValue(field.name,
isc.Date.parseStandardDate(columnValue.value));
} else if (columnValue.hasDateDefault) {
this.setItemValue(field.name, columnValue.classicValue);
} else {
diff -r 487d0f5b997e -r 0b5e6502cd76
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/DateTimeUIDefinition.java
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/DateTimeUIDefinition.java
Tue Jun 12 15:51:15 2012 +0200
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/DateTimeUIDefinition.java
Wed May 23 10:55:08 2012 +0200
@@ -11,17 +11,19 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010-2011 Openbravo SLU
+ * All portions are Copyright (C) 2010-2012 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
*/
package org.openbravo.client.kernel.reference;
+import java.text.SimpleDateFormat;
import java.util.Date;
import org.openbravo.base.exception.OBException;
import org.openbravo.base.model.domaintype.PrimitiveDomainType;
+import org.openbravo.client.kernel.RequestContext;
/**
* Implementation of the date time ui definition.
@@ -29,6 +31,8 @@
* @author mtaal
*/
public class DateTimeUIDefinition extends DateUIDefinition {
+ private String lastUsedPattern = null;
+ private SimpleDateFormat dateFormat = null;
@Override
public String getParentType() {
@@ -45,6 +49,17 @@
}
@Override
+ protected SimpleDateFormat getClassicFormat() {
+ String pattern =
RequestContext.get().getSessionAttribute("#AD_JavaDateTimeFormat").toString();
+ if (dateFormat == null || !pattern.equals(lastUsedPattern)) {
+ dateFormat = new SimpleDateFormat(pattern);
+ lastUsedPattern = pattern;
+ dateFormat.setLenient(true);
+ }
+ return dateFormat;
+ }
+
+ @Override
public synchronized Object createFromClassicString(String value) {
try {
if (value == null || value.length() == 0 || value.equals("null")) {
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
