CDPP / AMDA_IHM

Commit 3d9f783f453f6b2040160b0dd9a322c159d7b46d

Authored by Erdogan Furkan
1 parent 8046f4ee
Exists in master and in 14 other branches FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_6265, FER_7862, FER_9629, FER_TFCat, SpeasyGet, akkodis/amdadev, amdadev, openam

Some more modification

Showing 2 changed files with 8 additions and 9 deletions   Show diff stats
Inline Side-by-side
js/app/views/CatalogUI.js
  Diff comments   View file @3d9f783
@@ -17,9 +17,6 @@ Ext.define('amdaUI.CatalogUI', { @@ -17,9 +17,6 @@ Ext.define('amdaUI.CatalogUI', {
17 'Ext.ux.grid.filter.DateFilter', 17 'Ext.ux.grid.filter.DateFilter',
18 'Ext.ux.grid.filter.NumericFilter', 18 'Ext.ux.grid.filter.NumericFilter',
19 'Ext.ux.grid.filter.StringFilter', 19 'Ext.ux.grid.filter.StringFilter',
20 - // 'amdaUI.CustomNumericFilter',  
21 - // 'amdaUI.CustomStringFilter',  
22 - // 'amdaUI.CustomDateFilter',  
23 'amdaUI.CustomFilters', 20 'amdaUI.CustomFilters',
24 'amdaUI.OperationsTT', 21 'amdaUI.OperationsTT',
25 'amdaUI.DescriptionField', 22 'amdaUI.DescriptionField',
js/app/views/TimeTableUI.js
  Diff comments   View file @3d9f783
@@ -16,6 +16,7 @@ Ext.define('amdaUI.TimeTableUI', { @@ -16,6 +16,7 @@ Ext.define('amdaUI.TimeTableUI', {
16 'Ext.ux.grid.FiltersFeature', 16 'Ext.ux.grid.FiltersFeature',
17 'Ext.ux.grid.filter.DateFilter', 17 'Ext.ux.grid.filter.DateFilter',
18 'Ext.ux.grid.filter.NumericFilter', 18 'Ext.ux.grid.filter.NumericFilter',
  19 + 'amdaUI.CustomFilters',
19 'amdaUI.OperationsTT', 20 'amdaUI.OperationsTT',
20 'amdaUI.StatisticalPlug', 21 'amdaUI.StatisticalPlug',
21 'amdaUI.DescriptionField', 22 'amdaUI.DescriptionField',
@@ -399,6 +400,7 @@ Ext.define('amdaUI.TimeTableUI', { @@ -399,6 +400,7 @@ Ext.define('amdaUI.TimeTableUI', {
399 400
400 init: function (config) 401 init: function (config)
401 { 402 {
  403 + amdaUI.CustomFilters.init();
402 this.object = config.object; 404 this.object = config.object;
403 405
404 this.fieldName = new Ext.form.field.Text({ 406 this.fieldName = new Ext.form.field.Text({
@@ -508,12 +510,12 @@ Ext.define('amdaUI.TimeTableUI', { @@ -508,12 +510,12 @@ Ext.define('amdaUI.TimeTableUI', {
508 encode: true, // json encode the filter query 510 encode: true, // json encode the filter query
509 local: false, // defaults to false (remote filte 511 local: false, // defaults to false (remote filte
510 filters: [ 512 filters: [
511 - {type: 'numeric', dataIndex: 'durationDay'},  
512 - {type: 'numeric', dataIndex: 'durationHour'},  
513 - {type: 'numeric', dataIndex: 'durationMin'},  
514 - {type: 'numeric', dataIndex: 'durationSec'},  
515 - {type: 'date', dataIndex: 'start', dateFormat: 'c'},  
516 - {type: 'date', dataIndex: 'stop', dateFormat: 'c'} 513 + {type: 'customnumericfilter', dataIndex: 'durationDay'},
  514 + {type: 'customnumericfilter', dataIndex: 'durationHour'},
  515 + {type: 'customnumericfilter', dataIndex: 'durationMin'},
  516 + {type: 'customnumericfilter', dataIndex: 'durationSec'},
  517 + {type: 'customdatefilter', dataIndex: 'start', dateFormat: 'c'},
  518 + {type: 'customdatefilter', dataIndex: 'stop', dateFormat: 'c'}
517 ] 519 ]
518 }; 520 };
519 var cellEditing = Ext.create('Ext.grid.plugin.CellEditing', { 521 var cellEditing = Ext.create('Ext.grid.plugin.CellEditing', {