details: /erp/devel/pi/rev/26f2e2b7b3a7
changeset: 9321:26f2e2b7b3a7
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Thu Dec 23 11:30:41 2010 +0100
summary: [OBUIAPP] Refactor code on ob-grid.js
details: /erp/devel/pi/rev/4bbdb56b017f
changeset: 9322:4bbdb56b017f
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Thu Dec 23 11:31:24 2010 +0100
summary: [OBSERDS] Changed exportFormat to exportAs.
details: /erp/devel/pi/rev/ade9c029d150
changeset: 9323:ade9c029d150
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Thu Dec 23 11:32:09 2010 +0100
summary: [OBCQL] Refactor js and java code.
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
| 17 +--
modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListComponent.java
| 14 +--
modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListDataSource.java
| 8 +-
modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListUtils.java
| 4 +-
modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListWidgetProvider.java
| 2 +-
modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js
| 44 +++------
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java
| 8 +-
7 files changed, 33 insertions(+), 64 deletions(-)
diffs (207 lines):
diff -r ddff30bdc259 -r ade9c029d150
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
Thu Dec 23 11:23:10 2010 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
Thu Dec 23 11:32:09 2010 +0100
@@ -32,22 +32,19 @@
// exportProperties.exportFormat is supported (which is defaulted to csv).
// * {{{data}}} the parameters to post to the server, in addition the filter
criteria of the grid are posted.
exportData: function(exportProperties, data) {
- if (!data) {
- data = {};
- }
- if (!exportProperties) {
- exportProperties = {};
- }
- var dsURL = this.dataSource.dataURL;
- isc.addProperties(data, {
+ var d = data || {},
+ expProp = exportProperties || {},
+ dsURL = this.dataSource.dataURL;
+
+ isc.addProperties(d, {
_dataSource: this.dataSource.ID,
_operationType: 'fetch',
_noCount: true, // never do count for export
- exportFormat: exportProperties.exportFormat || 'csv',
+ exportAs: expProp.exportAs || 'csv',
exportToFile: true
}, this.getCriteria());
- OB.Utilities.postThroughHiddenFrame(dsURL, data);
+ OB.Utilities.postThroughHiddenFrame(dsURL, d);
}
});
diff -r ddff30bdc259 -r ade9c029d150
modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListComponent.java
---
a/modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListComponent.java
Thu Dec 23 11:23:10 2010 +0100
+++
b/modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListComponent.java
Thu Dec 23 11:32:09 2010 +0100
@@ -20,7 +20,6 @@
import java.util.UUID;
-import org.apache.log4j.Logger;
import org.openbravo.client.kernel.BaseTemplateComponent;
import org.openbravo.client.kernel.Template;
import org.openbravo.dal.service.OBDal;
@@ -35,23 +34,12 @@
static final String COMPONENT_ID = "QueryList";
private static final String TEMPLATEID = "337A637E2DDB4FABA2C793DFB937207D";
- private Logger log = Logger.getLogger(QueryListComponent.class);
-
- /*
- * (non-Javadoc)
- *
- * @see
org.openbravo.client.kernel.BaseTemplateComponent#getComponentTemplate()
- */
@Override
protected Template getComponentTemplate() {
return OBDal.getInstance().get(Template.class, TEMPLATEID);
}
- /*
- * (non-Javadoc)
- *
- * @see org.openbravo.client.kernel.BaseComponent#getId()
- */
+ @Override
public String getId() {
return COMPONENT_ID;
}
diff -r ddff30bdc259 -r ade9c029d150
modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListDataSource.java
---
a/modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListDataSource.java
Thu Dec 23 11:23:10 2010 +0100
+++
b/modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListDataSource.java
Thu Dec 23 11:32:09 2010 +0100
@@ -47,16 +47,12 @@
* the parameters passed in from the request
* @return the total number of objects
*/
+ @Override
protected int getCount(Map<String, String> parameters) {
return getData(parameters, 0, (Integer.MAX_VALUE - 1)).size();
}
- /*
- * (non-Javadoc)
- *
- * @see
org.openbravo.service.datasource.ReadOnlyDataSourceService#getData(java.util.Map,
int,
- * int)
- */
+ @Override
protected List<Map<String, Object>> getData(Map<String, String> parameters,
int startRow,
int endRow) {
OBContext.setAdminMode();
diff -r ddff30bdc259 -r ade9c029d150
modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListUtils.java
---
a/modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListUtils.java
Thu Dec 23 11:23:10 2010 +0100
+++
b/modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListUtils.java
Thu Dec 23 11:32:09 2010 +0100
@@ -42,7 +42,7 @@
import org.openbravo.model.ad.ui.Tab;
import org.openbravo.model.ad.ui.WindowTrl;
-public class QueryListUtils {
+class QueryListUtils {
private static final Logger log = Logger.getLogger(QueryListUtils.class);
public static String getWidgetClassFields(WidgetClass widgetClass, IncludeIn
includeIn) {
@@ -157,7 +157,7 @@
return obcColumns.list();
}
- public enum IncludeIn {
+ enum IncludeIn {
WidgetView(new String[] { "W" }), MaximizedView(new String[] { "W", "M"
}), ExportedFile(
new String[] { "W", "M", "E" });
diff -r ddff30bdc259 -r ade9c029d150
modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListWidgetProvider.java
---
a/modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListWidgetProvider.java
Thu Dec 23 11:23:10 2010 +0100
+++
b/modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListWidgetProvider.java
Thu Dec 23 11:32:09 2010 +0100
@@ -34,7 +34,7 @@
*/
public class QueryListWidgetProvider extends WidgetProvider {
- private static String GRID_PROPERTIES_REFERENCE =
"B36DF126DF5F4077A37F1E5B963AA636";
+ private static final String GRID_PROPERTIES_REFERENCE =
"B36DF126DF5F4077A37F1E5B963AA636";
private static final Logger log =
Logger.getLogger(QueryListWidgetProvider.class);
private static final String HEIGHT = "height";
private static final Long ROW_HEIGHT = 23L;
diff -r ddff30bdc259 -r ade9c029d150
modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js
---
a/modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js
Thu Dec 23 11:23:10 2010 +0100
+++
b/modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js
Thu Dec 23 11:32:09 2010 +0100
@@ -79,7 +79,6 @@
},
reloadGrid: function(rpcResponse, data, rpcRequest) {
-
this.grid.invalidateCache();
this.grid.filterData();
},
@@ -140,36 +139,25 @@
},
filterData: function(criteria, callback, requestProperties){
- if (!criteria) {
- criteria = {};
- }
- if (!requestProperties) {
- requestProperties = {};
- }
- requestProperties.showPrompt = false;
- criteria.widgetInstanceId = this.widget.dbInstanceId;
- criteria.rowsNumber = this.widget.rowsNumber;
- criteria.viewMode = this.widget.viewMode;
- return this.Super('filterData', [criteria, callback, requestProperties]);
+ var crit = criteria || {},
+ reqProperties = requestProperties || {};
+
+ reqProperties.showPrompt = false;
+ crit.widgetInstanceId = this.widget.dbInstanceId;
+ crit.rowsNumber = this.widget.rowsNumber;
+ crit.viewMode = this.widget.viewMode;
+ return this.Super('filterData', [crit, callback, reqProperties]);
},
fetchData: function(criteria, callback, requestProperties){
- if (!criteria) {
- criteria = {};
- }
- if (!requestProperties) {
- requestProperties = {};
- }
- requestProperties.showPrompt = false;
- if (requestProperties.params && requestProperties.params.exportToFile) {
- this.dataSource.dataFormat = requestProperties.exportAs;
- } else {
- this.dataSource.dataFormat = 'json';
- }
- criteria.widgetInstanceId = this.widget.dbInstanceId;
- criteria.rowsNumber = this.widget.rowsNumber;
- criteria.viewMode = this.widget.viewMode;
- return this.Super('fetchData', [criteria, callback, requestProperties]);
+ var crit = criteria || {},
+ reqProperties = requestProperties || {};
+
+ reqProperties.showPrompt = false;
+ crit.widgetInstanceId = this.widget.dbInstanceId;
+ crit.rowsNumber = this.widget.rowsNumber;
+ crit.viewMode = this.widget.viewMode;
+ return this.Super('fetchData', [crit, callback, reqProperties]);
},
cellClick: function (record, rowNum, colNum) {
diff -r ddff30bdc259 -r ade9c029d150
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java
---
a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java
Thu Dec 23 11:23:10 2010 +0100
+++
b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java
Thu Dec 23 11:32:09 2010 +0100
@@ -169,11 +169,11 @@
boolean isExport = "true".equals(parameters.get("exportToFile"));
if (isExport) {
- String exportFormat = parameters.get("exportFormat");
- if (StringUtils.isEmpty(exportFormat)) {
- exportFormat = "csv";
+ String exportAs = parameters.get("exportAs");
+ if (StringUtils.isEmpty(exportAs)) {
+ exportAs = "csv";
}
- if ("csv".equals(exportFormat)) {
+ if ("csv".equals(exportAs)) {
writeResultCSV(response, result);
}
} else {
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
