diff --git a/js/app/models/PlotObjects/PlotRequestObject.js b/js/app/models/PlotObjects/PlotRequestObject.js index e7430c8..905da57 100644 --- a/js/app/models/PlotObjects/PlotRequestObject.js +++ b/js/app/models/PlotObjects/PlotRequestObject.js @@ -30,7 +30,8 @@ Ext.define('amdaPlotObj.PlotRequestObject', { {name: 'one-file-per-interval', type: 'boolean'}, {name: 'last-plotted-tab', type: 'int', defaultValue: 0}, {name: 'last-tab-id', type: 'int', defaultValue: 0}, - {name: 'active-tab-id', type: 'int', defaultValue: 1} + {name: 'active-tab-id', type: 'int', defaultValue: 1}, + {name: 'all-in-one', type: 'boolean', defaultValue: false} ], hasMany: { @@ -122,10 +123,9 @@ Ext.define('amdaPlotObj.PlotRequestObject', { requestValues['file-prefix'] = this.get('file-prefix'); requestValues['one-file-per-interval'] = this.get('one-file-per-interval'); requestValues['last-plotted-tab'] = this.get('last-plotted-tab'); - requestValues['name'] = this.get('name'); - requestValues['active-tab-id'] = this.get('active-tab-id'); + requestValues['name'] = this.get('name'); + requestValues['timesrc'] = this.get('timesrc'); - requestValues['timesrc'] = this.get('timesrc'); // if there's at least one timeTable name into 'timeTables' collection if (this.get('timesrc') == amdaModel.AmdaTimeObject.inputTimeSrc[0] && this.get('timeTables') && this.get('timeTables').length){ // get complete timeTables collection @@ -143,22 +143,34 @@ Ext.define('amdaPlotObj.PlotRequestObject', { } }); } else { - requestValues['startDate'] = this.get('startDate'); - requestValues['stopDate'] = this.get('stopDate'); - requestValues['durationDay'] = this.get('durationDay'); - requestValues['durationHour'] = this.get('durationHour'); - requestValues['durationMin'] = this.get('durationMin'); - requestValues['durationSec'] = this.get('durationSec'); - } - - requestValues['tabs'] = []; + requestValues['startDate'] = this.get('startDate'); + requestValues['stopDate'] = this.get('stopDate'); + requestValues['durationDay'] = this.get('durationDay'); + requestValues['durationHour'] = this.get('durationHour'); + requestValues['durationMin'] = this.get('durationMin'); + requestValues['durationSec'] = this.get('durationSec'); + } - this.tabs().each(function (tab, index) { - requestValues['tabs'][index] = tab.getJsonValues(); - }); - - requestValues['last-tab-id'] = this.get('last-tab-id'); - + requestValues['tabs'] = []; + + if (this.get('all-in-one')) { + this.tabs().each(function (tab, index) { + requestValues['tabs'][index] = tab.getJsonValues(); + }); + + requestValues['active-tab-id'] = this.get('active-tab-id'); + requestValues['last-tab-id'] = this.get('last-tab-id'); + } + else { + var tab = this.tabs().getAt(this.get('active-tab-id')-1); + requestValues['tabs'][0] = tab.getJsonValues(); + + requestValues['tabs'][0]['id'] = "1"; + requestValues['active-tab-id'] = "1"; + requestValues['last-tab-id'] = "1"; + requestValues['last-plotted-tab'] = "0"; + } + return requestValues; } }); \ No newline at end of file diff --git a/js/app/views/PlotUI.js b/js/app/views/PlotUI.js index f09faaf..16a74cd 100644 --- a/js/app/views/PlotUI.js +++ b/js/app/views/PlotUI.js @@ -32,6 +32,8 @@ Ext.define('amdaUI.PlotUI', { plotElement : null, + allPlots : false, + constructor: function(config) { this.init(config); this.callParent(arguments); @@ -55,7 +57,8 @@ Ext.define('amdaUI.PlotUI', { this.updateObject(); this.object.set('active-tab-id', this.plotTabs.getSelectedTabId()); - + this.object.set('all-in-one', this.allPlots); + if ((this.object.get('id') != '') && (plotModule.linkedNode.get('text') == this.object.get('name'))) //update existing request plotModule.linkedNode.update(); @@ -286,7 +289,16 @@ Ext.define('amdaUI.PlotUI', { handler: function(button) { this.saveProcess(); } - } + },' ', { + xtype: 'checkbox', + boxLabel: 'All Plot Tabs', + listeners : { + scope: this, + change: function (cb, nv, ov) { + this.allPlots = nv; + } + } + } ] }); -- libgit2 0.21.2