Commit a727345a248483b55949621d6e261fad2fccbc7e
1 parent
b034ce89
Exists in
master
and in
112 other branches
Move EPN-TAP module to InteropUI.
Showing
5 changed files
with
12 additions
and
23 deletions
Show diff stats
js/app/AmdaApp.js
| ... | ... | @@ -296,8 +296,8 @@ Ext.define('amdaApp.AmdaApp', { |
| 296 | 296 | { name: 'TimeTables operations', iconCls: 'operations', module: 'ttsOpe-win' }, |
| 297 | 297 | { name: 'Manage catalogs', iconCls: 'catalog', module: 'catalog-win'}, |
| 298 | 298 | { name: 'Visualize catalogs', iconCls: 'visu_catalog', module: 'visu-win'}, |
| 299 | - { name: 'Interoperability', iconCls: 'interop', module: 'interop-win' }, | |
| 300 | - { name: 'EPN-TAP', iconCls: 'epntap', module: 'epntap-win' } | |
| 299 | + { name: 'Interoperability', iconCls: 'interop', module: 'interop-win' } | |
| 300 | + // { name: 'EPN-TAP', iconCls: 'epntap', module: 'epntap-win' } | |
| 301 | 301 | ] |
| 302 | 302 | }), |
| 303 | 303 | |
| ... | ... |
js/app/controllers/EpnTapModule.js
| ... | ... | @@ -28,7 +28,7 @@ Ext.define('amdaDesktop.EpnTapModule', { |
| 28 | 28 | |
| 29 | 29 | extend: 'amdaDesktop.AmdaModule', |
| 30 | 30 | requires: ['amdaUI.EpnTapUI'], |
| 31 | - contentId : 'EpnTapUI', | |
| 31 | + // contentId : 'EpnTapUI', | |
| 32 | 32 | |
| 33 | 33 | /** The alias name of the module view. */ |
| 34 | 34 | uiType: 'panelEpnTap', |
| ... | ... | @@ -39,16 +39,11 @@ Ext.define('amdaDesktop.EpnTapModule', { |
| 39 | 39 | /** The name of the documentation file related to the module. */ |
| 40 | 40 | helpFile : 'epnTapHelp', |
| 41 | 41 | |
| 42 | - /** Window dimentions. */ | |
| 43 | - width : 1000, | |
| 44 | - height: 550, | |
| 45 | - | |
| 46 | 42 | /** |
| 47 | 43 | Module initialisation. |
| 48 | 44 | */ |
| 49 | 45 | init: function() { |
| 50 | - | |
| 51 | - // TODO: Utiliser des stores pour accรฉder aux fichiers JS !! | |
| 46 | + // TODO: Utiliser des stores pour accรฉder aux fichiers JS | |
| 52 | 47 | |
| 53 | 48 | this.metadata = JSON.parse(loadTextFileAjaxSync('../../generic_data/EpnTapData/metadata.json', 'application/json')); |
| 54 | 49 | this.services = JSON.parse(loadTextFileAjaxSync('../../generic_data/EpnTapData/services.json', 'application/json')); |
| ... | ... | @@ -104,7 +99,6 @@ Ext.define('amdaDesktop.EpnTapModule', { |
| 104 | 99 | initializes the `productType` combobox and the `servicesGrid` table. |
| 105 | 100 | */ |
| 106 | 101 | onWindowLoaded: function() { |
| 107 | - | |
| 108 | 102 | this.productTypeCB = Ext.getCmp('epnTapProductTypeCB'); |
| 109 | 103 | this.targetClassCB = Ext.getCmp('epnTapTargetClassCB'); |
| 110 | 104 | this.targetNameCB = Ext.getCmp('epnTapTargetNameCB'); |
| ... | ... |
js/app/controllers/InteropModule.js
| ... | ... | @@ -30,8 +30,8 @@ Ext.define('amdaDesktop.InteropModule', { |
| 30 | 30 | * @cfg {String} window definitions |
| 31 | 31 | * @required |
| 32 | 32 | */ |
| 33 | - height: 580, | |
| 34 | - width: 850, | |
| 33 | + height: 650, | |
| 34 | + width: 1050, | |
| 35 | 35 | uiType : 'panelInterop', |
| 36 | 36 | helpTitle :'Help on Interop Module', |
| 37 | 37 | |
| ... | ... | @@ -433,8 +433,8 @@ Ext.define('amdaDesktop.InteropModule', { |
| 433 | 433 | id: this.id, |
| 434 | 434 | title:this.title, |
| 435 | 435 | layout: 'anchor', |
| 436 | - width:600, | |
| 437 | - height:550, | |
| 436 | + width:800, | |
| 437 | + height:600, | |
| 438 | 438 | modal: true, |
| 439 | 439 | minimizable: false, |
| 440 | 440 | iconCls: this.icon, |
| ... | ... |
js/app/views/EpnTapUI.js
| ... | ... | @@ -126,7 +126,6 @@ Ext.define('amdaUI.EpnTapUI', { |
| 126 | 126 | Method constructor, which basically call the `init()` method to create the EpnTap panel. |
| 127 | 127 | */ |
| 128 | 128 | constructor: function(config) { |
| 129 | - console.log("EpnTAPUI constructor"); | |
| 130 | 129 | this.init(config); |
| 131 | 130 | this.callParent(arguments); |
| 132 | 131 | }, |
| ... | ... | @@ -140,8 +139,7 @@ Ext.define('amdaUI.EpnTapUI', { |
| 140 | 139 | them private (ie. to avoid `EpnTapUI.createServicesGrid();`, which doesn't make sense). |
| 141 | 140 | */ |
| 142 | 141 | init: function(config) { |
| 143 | - var mod = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.epntap.id); | |
| 144 | - console.log("init: module =", mod); | |
| 142 | + var mod = config.module; | |
| 145 | 143 | |
| 146 | 144 | /************ |
| 147 | 145 | *** Grids *** |
| ... | ... | @@ -311,7 +309,7 @@ Ext.define('amdaUI.EpnTapUI', { |
| 311 | 309 | return new Ext.panel.Panel({ |
| 312 | 310 | id: 'epnTapGridsPanel', |
| 313 | 311 | region: 'center', |
| 314 | - height: 350, | |
| 312 | + // height: 350, | |
| 315 | 313 | layout: { type: 'hbox', pack: 'start', align: 'stretch' }, |
| 316 | 314 | items: [ |
| 317 | 315 | createServicesGrid(), |
| ... | ... | @@ -415,7 +413,7 @@ Ext.define('amdaUI.EpnTapUI', { |
| 415 | 413 | items: [{ // Left part |
| 416 | 414 | xtype : 'container', |
| 417 | 415 | layout: 'form', |
| 418 | - flex: 2, | |
| 416 | + flex: 3, | |
| 419 | 417 | items: [ |
| 420 | 418 | createProductTypeCB(), |
| 421 | 419 | createTargetClassCB(), |
| ... | ... | @@ -581,9 +579,6 @@ Ext.define('amdaUI.EpnTapUI', { |
| 581 | 579 | // Ext.apply(this, Ext.apply(arguments, config)); |
| 582 | 580 | |
| 583 | 581 | var myConf = { |
| 584 | - width: 1000, | |
| 585 | - height: 550, | |
| 586 | - layout: 'border', | |
| 587 | 582 | items: [ |
| 588 | 583 | createServiceFilterPanel(), |
| 589 | 584 | createGridsPanel(), |
| ... | ... |
js/app/views/InteropUI.js