details: https://code.openbravo.com/erp/devel/pi/rev/9618efa7f09f changeset: 15438:9618efa7f09f user: Iván Perdomo <ivan.perdomo <at> openbravo.com> date: Fri Feb 10 21:24:00 2012 +0100 summary: Issue 19728: Format js files org.openbravo.client.application - alert-management
details: https://code.openbravo.com/erp/devel/pi/rev/5a37787b376e changeset: 15439:5a37787b376e user: Iván Perdomo <ivan.perdomo <at> openbravo.com> date: Fri Feb 10 21:34:32 2012 +0100 summary: Issue 19728: Format js fiels of org.openbravo.client.application - classic details: https://code.openbravo.com/erp/devel/pi/rev/f618c95e05de changeset: 15440:f618c95e05de user: Iván Perdomo <ivan.perdomo <at> openbravo.com> date: Fri Feb 10 21:46:10 2012 +0100 summary: Issue 19728: Format js files org.openbravo.client.application - formitem details: https://code.openbravo.com/erp/devel/pi/rev/1702a95252cc changeset: 15441:1702a95252cc user: Iván Perdomo <ivan.perdomo <at> openbravo.com> date: Sat Feb 11 15:25:30 2012 +0100 summary: Issue 19728: Format js files org.openbravo.client.application - form details: https://code.openbravo.com/erp/devel/pi/rev/3b356d6be610 changeset: 15442:3b356d6be610 user: Iván Perdomo <ivan.perdomo <at> openbravo.com> date: Sat Feb 11 15:26:18 2012 +0100 summary: Issue 19728: Revert previous formatting for merge changes in pi details: https://code.openbravo.com/erp/devel/pi/rev/5b6b02925465 changeset: 15443:5b6b02925465 user: Iván Perdomo <ivan.perdomo <at> openbravo.com> date: Sat Feb 11 15:26:44 2012 +0100 summary: Issue 19728: Merge changes from pi details: https://code.openbravo.com/erp/devel/pi/rev/d3d34b7bf993 changeset: 15444:d3d34b7bf993 user: Iván Perdomo <ivan.perdomo <at> openbravo.com> date: Sat Feb 11 15:28:57 2012 +0100 summary: Issue 19728: Reformat ob-formitem-number.js diffstat: modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js | 286 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-management-view.js | 212 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-manager.js | 93 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js | 212 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-help.js | 49 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-popup.js | 61 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-window.js | 156 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-canvas.js | 49 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-checkbox.js | 21 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-date.js | 92 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-datechooser.js | 15 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-datetime.js | 100 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-encrypted.js | 4 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js | 8 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk.js | 10 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js | 298 ++- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-link.js | 13 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-linkbutton.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-linktitle.js | 8 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list-filter.js | 22 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js | 206 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js | 160 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search-attribute.js | 19 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search.js | 123 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-section-audit.js | 18 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-section.js | 61 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-spinner.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-text.js | 8 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-textarea.js | 13 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-time.js | 19 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-yesno.js | 18 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-form-button.js | 4 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-onchange-registry.js | 131 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-statusbar.js | 291 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-attachments.js | 455 +++-- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-linked-items.js | 263 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-notes.js | 265 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js | 762 +++++---- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js | 10 +- 40 files changed, 2317 insertions(+), 2224 deletions(-) diffs (truncated from 9192 to 300 lines): diff -r cc337f4d535b -r d3d34b7bf993 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js Fri Feb 10 21:09:22 2012 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js Sat Feb 11 15:28:57 2012 +0100 @@ -11,7 +11,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2011 Openbravo SLU + * All portions are Copyright (C) 2011-2012 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -37,72 +37,71 @@ showCellContextMenus: true, selectOnEdit: false, dataPageSize: 100, - + // keeps track if we are in objectSelectionMode or in toggleSelectionMode // objectSelectionMode = singleRecordSelection === true singleRecordSelection: false, dataProperties: { - useClientFiltering: false//, + useClientFiltering: false //, //useClientSorting: false }, - - gridFields: [ - { name: 'alertRule', - title: OB.I18N.getLabel('OBUIAPP_AlertGrid_AlertRule'), - displayField: 'alertRule._identifier', - canFilter: true, - canEdit: false, - filterOnKeypress: true, - filterEditorType: 'OBFKFilterTextItem', - type: '_id_19' + + gridFields: [{ + name: 'alertRule', + title: OB.I18N.getLabel('OBUIAPP_AlertGrid_AlertRule'), + displayField: 'alertRule._identifier', + canFilter: true, + canEdit: false, + filterOnKeypress: true, + filterEditorType: 'OBFKFilterTextItem', + type: '_id_19' + }, { + name: 'description', + title: OB.I18N.getLabel('OBUIAPP_AlertGrid_Alert'), + canFilter: true, + canEdit: false, + filterOnKeypress: true, + filterEditorType: 'OBTextItem', + type: '_id_10' + }, { + name: 'creationDate', + title: OB.I18N.getLabel('OBUIAPP_AlertGrid_Time'), + canFilter: true, + canEdit: false, + filterEditorType: 'OBMiniDateRangeItem', + type: '_id_16' + }, { + name: 'comments', + title: OB.I18N.getLabel('OBUIAPP_AlertGrid_Note'), + canFilter: true, + canEdit: true, + filterOnKeypress: true, + filterEditorType: 'OBTextItem', + editorType: 'OBTextItem', + editorProperties: { + width: '90%', + columnName: 'comments', + disabled: false, + updatable: true }, - { name: 'description', - title: OB.I18N.getLabel('OBUIAPP_AlertGrid_Alert'), - canFilter: true, - canEdit: false, - filterOnKeypress: true, - filterEditorType: 'OBTextItem', - type: '_id_10' - }, - { name: 'creationDate', - title: OB.I18N.getLabel('OBUIAPP_AlertGrid_Time'), - canFilter: true, - canEdit: false, - filterEditorType: 'OBMiniDateRangeItem', - type: '_id_16' - }, - { name: 'comments', - title: OB.I18N.getLabel('OBUIAPP_AlertGrid_Note'), - canFilter: true, - canEdit: true, - filterOnKeypress: true, - filterEditorType: 'OBTextItem', - editorType: 'OBTextItem', - editorProperties: { - width: '90%', - columnName: 'comments', - disabled: false, - updatable: true - }, - type: '_id_10' - }, - { name: 'recordID', - title: OB.I18N.getLabel('OBUIAPP_AlertGrid_Record'), - canFilter: true, - canEdit: false, - isLink: true, - filterOnKeypress: true, - filterEditorType: 'OBTextItem', - type: '_id_10', - formatCellValueFunctionReplaced: true, - formatCellValue: function(value, record, rowNum, colNum, grid){ - return ''; - } + type: '_id_10' + }, { + name: 'recordID', + title: OB.I18N.getLabel('OBUIAPP_AlertGrid_Record'), + canFilter: true, + canEdit: false, + isLink: true, + filterOnKeypress: true, + filterEditorType: 'OBTextItem', + type: '_id_10', + formatCellValueFunctionReplaced: true, + formatCellValue: function (value, record, rowNum, colNum, grid) { + return ''; } - ], - - initWidget: function() { + }], + + initWidget: function () { // added for showing counts in the filtereditor row this.checkboxFieldDefaults = isc.addProperties(this.checkboxFieldDefaults, { canFilter: true, @@ -116,58 +115,63 @@ filterEditorType: 'StaticTextItem' }); - this.contextMenu = this.getMenuConstructor().create({items: []}); - + this.contextMenu = this.getMenuConstructor().create({ + items: [] + }); + OB.Datasource.get('ADAlert', this, null, true); this.Super('initWidget', arguments); }, - - setDataSource: function(ds) { + + setDataSource: function (ds) { this.Super('setDataSource', [ds, this.gridFields]); // Some properties need to be set when the datasource is loaded to avoid errors when form is // open the first time. this.setSelectionAppearance('checkbox'); - + // this extra call is needed to solve this issue: // https://issues.openbravo.com/view.php?id=17145 this.refreshFields(); - + this.sort('creationDate', 'descending'); this.fetchData(); }, - dataArrived: function(startRow, endRow){ + dataArrived: function (startRow, endRow) { this.getGridTotalRows(); return this.Super('dataArrived', arguments); }, - getGridTotalRows: function(){ - var criteria = this.getCriteria() || {}, requestProperties = {}; + getGridTotalRows: function () { + var criteria = this.getCriteria() || {}, + requestProperties = {}; if (!OB.AlertManagement.sections[this.alertStatus].expanded) { // fetch to the datasource with an empty criteria to get all the rows requestProperties.params = requestProperties.params || {}; requestProperties.params[OB.Constants.WHERE_PARAMETER] = this.getFilterClause(); - requestProperties.clientContext = {alertStatus: this.alertStatus}; - this.dataSource.fetchData(criteria, function(dsResponse, data, dsRequest){ - OB.AlertManagement.setTotalRows(dsResponse.totalRows, dsResponse.clientContext.alertStatus); - }, requestProperties ); + requestProperties.clientContext = { + alertStatus: this.alertStatus + }; + this.dataSource.fetchData(criteria, function (dsResponse, data, dsRequest) { + OB.AlertManagement.setTotalRows(dsResponse.totalRows, dsResponse.clientContext.alertStatus); + }, requestProperties); } else { OB.AlertManagement.setTotalRows(this.getTotalRows(), this.alertStatus); } }, - - onFetchData: function(criteria, requestProperties){ + + onFetchData: function (criteria, requestProperties) { requestProperties = requestProperties || {}; requestProperties.params = requestProperties.params || {}; requestProperties.params[OB.Constants.WHERE_PARAMETER] = this.getFilterClause(); }, - - getFilterClause: function() { + + getFilterClause: function () { var i, filterClause = '', alertRuleIds = '', arlength = OB.AlertManagement.alertRules.length, @@ -177,13 +181,13 @@ if (alertRuleIds !== '') { alertRuleIds += ','; } - alertRuleIds += '\'' + OB.AlertManagement.alertRules[i].alertRuleId +'\''; + alertRuleIds += '\'' + OB.AlertManagement.alertRules[i].alertRuleId + '\''; // if an alertRule has some alerts to filter by, add them to the where clause as: // alerts are of a different alertRule or only the alerts predefined // this only happens if the alertRule has an SQL filter expression defined if (OB.AlertManagement.alertRules[i].alerts) { filterClause += ' and (e.alertRule.id != \'' + OB.AlertManagement.alertRules[i].alertRuleId + '\''; - filterClause += ' or e.id in (' +OB.AlertManagement.alertRules[i].alerts + '))'; + filterClause += ' or e.id in (' + OB.AlertManagement.alertRules[i].alerts + '))'; } } if (alertRuleIds !== '') { @@ -196,8 +200,8 @@ } return whereClause; }, - - headerClick: function(fieldNum, header, autoSaveDone){ + + headerClick: function (fieldNum, header, autoSaveDone) { var field = this.fields[fieldNum]; if (this.isCheckboxField(field) && this.singleRecordSelection) { this.deselectAllRecords(); @@ -205,10 +209,10 @@ } return this.Super('headerClick', arguments); }, - + cellClick: function (record, rowNum, colNum) { var i, tabId, field = this.getField(colNum), - length = OB.AlertManagement.alertRules.length; + length = OB.AlertManagement.alertRules.length; for (i = 0; i < length; i++) { if (OB.AlertManagement.alertRules[i].alertRuleId === record.alertRule) { tabId = OB.AlertManagement.alertRules[i].tabId; @@ -218,15 +222,15 @@ OB.Utilities.openDirectTab(tabId, record.referenceSearchKey); } }, - - recordClick: function(viewer, record, recordNum, field, fieldNum, value, rawValue){ + + recordClick: function (viewer, record, recordNum, field, fieldNum, value, rawValue) { this.handleRecordSelection(viewer, record, recordNum, field, fieldNum, value, rawValue, false, true); }, - - + + // +++++++++++++++++++++++++++++ Record Selection Handling +++++++++++++++++++++++ // Functions based on the ob-view-grid.js Record Selection Handling. - deselectAllRecords: function(preventUpdateSelectInfo, autoSaveDone){ + deselectAllRecords: function (preventUpdateSelectInfo, autoSaveDone) { this.allSelected = false; var ret = this.Super('deselectAllRecords', arguments); this.lastSelectedRecord = null; @@ -236,14 +240,14 @@ return ret; }, - selectAllRecords: function(autoSaveDone){ + selectAllRecords: function (autoSaveDone) { this.allSelected = true; var ret = this.Super('selectAllRecords', arguments); this.selectionUpdated(); return ret; }, - updateSelectedCountDisplay: function(){ + updateSelectedCountDisplay: function () { var selection = this.getSelection(); var selectionLength = selection.getLength(); var newValue = ' '; ------------------------------------------------------------------------------ Virtualization & Cloud Management Using Capacity Planning Cloud computing makes use of virtualization - but cloud computing also focuses on allowing computing to be delivered as a service. http://www.accelacomm.com/jaw/sfnl/114/51521223/ _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
