CDPP / AMDA_IHM

Commit edd2e65045d0757f0054f22a8931d542efc77a3b

Authored by Hacene SI HADJ MOHAND
1 parent 833e6c62
Exists in master and in 100 other branches 10098, 10178, 5390, 6629, 6728, 6920, 7494, 7497, 7616, 8459, 8528, 8928, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9345, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, akkodis/amdadev, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, master_vge, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, remoteData, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, special-params, test-merge, ws_get_catalog

correcting 7100

Showing 1 changed file with 43 additions and 43 deletions   Show diff stats
Inline Side-by-side
js/app/views/CatalogUI.js
  Diff comments   View file @edd2e65
... ... @@ -366,7 +366,7 @@ Ext.define('amdaUI.CatalogUI', {
366 366 filter: { type: 'numeric'}
367 367 }
368 368 ];
369   -
  369 + var pramColumnWidth =120*(1-0.7*(1-1/result.parameters.length));
370 370 Ext.Array.each(result.parameters, function(obj, index) {
371 371 var field = {
372 372 name: obj.id
... ... @@ -384,43 +384,43 @@ Ext.define('amdaUI.CatalogUI', {
384 384 });
385 385 column = Ext.apply({}, column, {
386 386 xtype: 'gridcolumn',
387   - width : 50. * parseInt(obj.size),
  387 + width : pramColumnWidth * parseInt(obj.size),
388 388 editor: 'textfield',
389 389 filter: { type: 'numeric'}
390 390 });
391 391 break;
392   - case 1: //dateTime
393   - field = Ext.apply({}, field, {
394   - type : 'date',
395   - dateFormat: 'Y-m-d\\TH:i:s',
396   - convert: function(value,rec) {
397   - if (!Ext.isDate(value)){
398   - var valueString = new String(value);
399   - return new Date(valueString.replace(/\-/g,'\/').replace(/[T|Z]/g,' '));
400   - }
401   - return value;
402   - }
403   -
404   - });
405   - column = Ext.apply({}, column, {
406   - xtype: 'datecolumn',
407   - width : 120,
408   - editor : {
409   - xtype:'datefield',
410   - allowBlank:false,
411   - hideTrigger: true,
412   - format : 'Y-m-d\\TH:i:s'
413   - },
414   - filter: { type: 'date', dateFormat: 'Y-m-d' }
415   - });
416   - break;
  392 + case 1: //dateTime
  393 + field = Ext.apply({}, field, {
  394 + type : 'date',
  395 + dateFormat: 'Y-m-d\\TH:i:s',
  396 + convert: function(value,rec) {
  397 + if (!Ext.isDate(value)){
  398 + var valueString = new String(value);
  399 + return new Date(valueString.replace(/\-/g,'\/').replace(/[T|Z]/g,' '));
  400 + }
  401 + return value;
  402 + }
  403 +
  404 + });
  405 + column = Ext.apply({}, column, {
  406 + xtype: 'datecolumn',
  407 + width : 120,
  408 + editor : {
  409 + xtype:'datefield',
  410 + allowBlank:false,
  411 + hideTrigger: true,
  412 + format : 'Y-m-d\\TH:i:s'
  413 + },
  414 + filter: { type: 'date', dateFormat: 'Y-m-d' }
  415 + });
  416 + break;
417 417 case 2: //string
418 418 field = Ext.apply({}, field, {
419 419 type: 'string'
420 420 });
421 421 column = Ext.apply({}, column, {
422 422 xtype: 'gridcolumn',
423   - width : 50. * parseInt(obj.size),
  423 + width : pramColumnWidth * parseInt(obj.size),
424 424 editor: 'textfield',
425 425 filter: { type: 'string'}
426 426 });
... ... @@ -431,25 +431,25 @@ Ext.define('amdaUI.CatalogUI', {
431 431 });
432 432 column = Ext.apply({}, column, {
433 433 xtype: 'gridcolumn',
434   - width : 50. * parseInt(obj.size),
  434 + width : pramColumnWidth * parseInt(obj.size),
435 435 editor: 'textfield',
436 436 filter: { type: 'numeric'}
437 437 });
438 438 break;
439   - default:
440   - field = Ext.apply({}, field, {
441   - type: 'string'
442   - });
443   - column = Ext.apply({}, column, {
444   - xtype: 'gridcolumn',
445   - width : 50. * parseInt(obj.size),
446   - editor: 'textfield',
447   - filter: { type: 'string'}
448   - });
449   - }
450   - fieldsConfig.push(field);
451   - columnsConfig.push(column);
452   - });
  439 + default:
  440 + field = Ext.apply({}, field, {
  441 + type: 'string'
  442 + });
  443 + column = Ext.apply({}, column, {
  444 + xtype: 'gridcolumn',
  445 + width : pramColumnWidth * parseInt(obj.size),
  446 + editor: 'textfield',
  447 +filter: { type: 'string'}
  448 + });
  449 +}
  450 +fieldsConfig.push(field);
  451 +columnsConfig.push(column);
  452 +});
453 453  
454 454 var store = Ext.create('Ext.data.Store', {
455 455 fields: fieldsConfig,
... ...