diff --git a/js/app/AmdaApp.js b/js/app/AmdaApp.js index af700da..f784bba 100755 --- a/js/app/AmdaApp.js +++ b/js/app/AmdaApp.js @@ -296,8 +296,8 @@ Ext.define('amdaApp.AmdaApp', { { name: 'TimeTables operations', iconCls: 'operations', module: 'ttsOpe-win' }, { name: 'Manage catalogs', iconCls: 'catalog', module: 'catalog-win'}, { name: 'Visualize catalogs', iconCls: 'visu_catalog', module: 'visu-win'}, - { name: 'Interoperability', iconCls: 'interop', module: 'interop-win' }, - { name: 'EPN-TAP', iconCls: 'epntap', module: 'epntap-win' } + { name: 'Interoperability', iconCls: 'interop', module: 'interop-win' } + // { name: 'EPN-TAP', iconCls: 'epntap', module: 'epntap-win' } ] }), diff --git a/js/app/controllers/EpnTapModule.js b/js/app/controllers/EpnTapModule.js index c68438c..79a6b2c 100644 --- a/js/app/controllers/EpnTapModule.js +++ b/js/app/controllers/EpnTapModule.js @@ -28,7 +28,7 @@ Ext.define('amdaDesktop.EpnTapModule', { extend: 'amdaDesktop.AmdaModule', requires: ['amdaUI.EpnTapUI'], - contentId : 'EpnTapUI', + // contentId : 'EpnTapUI', /** The alias name of the module view. */ uiType: 'panelEpnTap', @@ -39,16 +39,11 @@ Ext.define('amdaDesktop.EpnTapModule', { /** The name of the documentation file related to the module. */ helpFile : 'epnTapHelp', - /** Window dimentions. */ - width : 1000, - height: 550, - /** Module initialisation. */ init: function() { - - // TODO: Utiliser des stores pour accéder aux fichiers JS !! + // TODO: Utiliser des stores pour accéder aux fichiers JS this.metadata = JSON.parse(loadTextFileAjaxSync('../../generic_data/EpnTapData/metadata.json', 'application/json')); this.services = JSON.parse(loadTextFileAjaxSync('../../generic_data/EpnTapData/services.json', 'application/json')); @@ -104,7 +99,6 @@ Ext.define('amdaDesktop.EpnTapModule', { initializes the `productType` combobox and the `servicesGrid` table. */ onWindowLoaded: function() { - this.productTypeCB = Ext.getCmp('epnTapProductTypeCB'); this.targetClassCB = Ext.getCmp('epnTapTargetClassCB'); this.targetNameCB = Ext.getCmp('epnTapTargetNameCB'); diff --git a/js/app/controllers/InteropModule.js b/js/app/controllers/InteropModule.js index 1d5c55c..3aa57b7 100644 --- a/js/app/controllers/InteropModule.js +++ b/js/app/controllers/InteropModule.js @@ -30,8 +30,8 @@ Ext.define('amdaDesktop.InteropModule', { * @cfg {String} window definitions * @required */ - height: 580, - width: 850, + height: 650, + width: 1050, uiType : 'panelInterop', helpTitle :'Help on Interop Module', @@ -433,8 +433,8 @@ Ext.define('amdaDesktop.InteropModule', { id: this.id, title:this.title, layout: 'anchor', - width:600, - height:550, + width:800, + height:600, modal: true, minimizable: false, iconCls: this.icon, diff --git a/js/app/views/EpnTapUI.js b/js/app/views/EpnTapUI.js index cc2480a..fa94e61 100644 --- a/js/app/views/EpnTapUI.js +++ b/js/app/views/EpnTapUI.js @@ -126,7 +126,6 @@ Ext.define('amdaUI.EpnTapUI', { Method constructor, which basically call the `init()` method to create the EpnTap panel. */ constructor: function(config) { - console.log("EpnTAPUI constructor"); this.init(config); this.callParent(arguments); }, @@ -140,8 +139,7 @@ Ext.define('amdaUI.EpnTapUI', { them private (ie. to avoid `EpnTapUI.createServicesGrid();`, which doesn't make sense). */ init: function(config) { - var mod = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.epntap.id); - console.log("init: module =", mod); + var mod = config.module; /************ *** Grids *** @@ -311,7 +309,7 @@ Ext.define('amdaUI.EpnTapUI', { return new Ext.panel.Panel({ id: 'epnTapGridsPanel', region: 'center', - height: 350, + // height: 350, layout: { type: 'hbox', pack: 'start', align: 'stretch' }, items: [ createServicesGrid(), @@ -415,7 +413,7 @@ Ext.define('amdaUI.EpnTapUI', { items: [{ // Left part xtype : 'container', layout: 'form', - flex: 2, + flex: 3, items: [ createProductTypeCB(), createTargetClassCB(), @@ -581,9 +579,6 @@ Ext.define('amdaUI.EpnTapUI', { // Ext.apply(this, Ext.apply(arguments, config)); var myConf = { - width: 1000, - height: 550, - layout: 'border', items: [ createServiceFilterPanel(), createGridsPanel(), diff --git a/js/app/views/InteropUI.js b/js/app/views/InteropUI.js index d1f73df..85b6a45 100644 --- a/js/app/views/InteropUI.js +++ b/js/app/views/InteropUI.js @@ -108,7 +108,7 @@ Ext.define('amdaUI.InteropUI', { xtype : 'panelEpnTap', id : 'epnTapTab', title : 'EPN-TAP', - layout : 'fit' + module: Ext.create('amdaDesktop.EpnTapModule') }; }, -- libgit2 0.21.2