Merge branch 'FER_7862' into amdadev

Benjamin Renard
2 parents 6f8db0b8 fbdbf740
Showing 5 changed files with 95 additions and 22 deletions Show diff stats
help/catalogTTFilterHelp
js/app/views/CatalogUI.js
js/app/views/CustomFilters.js
js/app/views/TimeTableUI.js
php/classes/CatalogCacheFilterObject.php
@@ -0,0 +1,29 @@
+<p>
+The filter function is an only on-screen function, nothing will be saved untill you decide to save the catalog or time table. There is also a "<b><i>Clear Filters</i></b>" button at top right of the grid which will erase all filters applied on screen.<br/>
+</p>
+<p>
+The mechanism is the same for integer and double type columns.<br/>
+Once in the filter menu you will see three boxes you are able to fill:
+<ul>
+  <li><b><i> '>'</i></b> box: returns on screen intervals where the values of the filtered column are higher than the number filled in the box.</li>
+  <li><b><i> '<'</i></b> box: returns on screen intervals where the values of the filtered column are lower than the number filled in the box.</li>
+  <li><b><i> '='</i></b> box: returns on screen intervals where the values of the filtered column are the same than the number filled in the box.</li>
+</ul>
+</p>  
+
+<p>
+For the filter on a string column, there is only one box. The filter will return on screen the intervals where the value of the filtered column contains the filled string of characters
+</p>  
+
+<p>
+For the date filter, the boxes are self-explanatory:
+<ul>
+  <li><b><i> 'before'</i></b> box: returns on screen intervals where the values of the filtered column are before than the date filled in the box.</li>
+  <li><b><i> 'after'</i></b> box: returns on screen intervals where the values of the filtered column are after than the date filled in the box.</li>
+  <li><b><i> 'on'</i></b> box: returns on screen intervals where the values of the filtered column are the same than the date filled in the box.</li>
+</ul>
+</p> 
+
+
+
+
@@ -17,6 +17,7 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
         'Ext.ux.grid.filter.DateFilter',
         'Ext.ux.grid.filter.NumericFilter',
         'Ext.ux.grid.filter.StringFilter',
+        'amdaUI.CustomFilters',
         'amdaUI.OperationsTT',
         'amdaUI.DescriptionField',
         'Ext.grid.plugin.BufferedRenderer',
@@ -377,7 +378,7 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                             updateDurationColumnsVisibility(this.ownerCt.getGridColumns(), amdaUI.CatalogUI.COL_TO_HIDE_DURATION + '1');
                         }
                     },
-                    filter: {type: 'numeric'}
+                    filter: {type: 'customnumericfilter'}
                 },
                 {
                     xtype: 'gridcolumn',
@@ -397,7 +398,7 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                             updateDurationColumnsVisibility(this.ownerCt.getGridColumns(), amdaUI.CatalogUI.COL_TO_HIDE_DURATION + '2');
                         }
                     },
-                    filter: {type: 'numeric'}
+                    filter: {type: 'customnumericfilter'}
                 },
                 {
                     xtype: 'gridcolumn',
@@ -417,7 +418,7 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                             updateDurationColumnsVisibility(this.ownerCt.getGridColumns(), amdaUI.CatalogUI.COL_TO_HIDE_DURATION + '3');
                         }
                     },
-                    filter: {type: 'numeric'}
+                    filter: {type: 'customnumericfilter'}
                 },
                 {
                     xtype: 'gridcolumn',
@@ -437,7 +438,7 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                             updateDurationColumnsVisibility(this.ownerCt.getGridColumns(), amdaUI.CatalogUI.COL_TO_HIDE_DURATION + '4');
                         }
                     },
-                    filter: {type: 'numeric'}
+                    filter: {type: 'customnumericfilter'}
                 }
             ];
             var pramColumnWidth = 120 * (1 - 0.7 * (1 - 1 / result.parameters.length));
@@ -462,7 +463,7 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                             xtype: 'gridcolumn',
                             width: pramColumnWidth * parseInt(obj.size),
                             editor: 'textfield',
-                            filter: {type: 'numeric', menuItemCfgs: {decimalPrecision: 10}},
+                            filter: {type: 'customnumericfilter', menuItemCfgs: {decimalPrecision: 10}},
                             renderer :function(value){
                                 return (value == "NAN") ? "nan": value;
                             },
@@ -488,7 +489,7 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                                 hideTrigger: true,
                                 format: 'Y-m-d\\TH:i:s.u'
                             },
-                            filter: {type: 'date', dateFormat: 'Y-m-d'},
+                            filter: {type: 'customdatefilter', dateFormat: 'Y-m-d'},
                             renderer: function (value) {
                                 if (value != null) {
                                     if (Ext.isDate(value)) {
@@ -510,14 +511,14 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                             xtype: 'gridcolumn',
                             width: pramColumnWidth * parseInt(obj.size),
                             editor: 'textfield',
+                            filter: {type: 'customstringfilter'},
                             renderer :function(value){
 				var renderedVal = value;
                                 if(value.toLowerCase().startsWith("http://") ||value.toLowerCase().startsWith("https://")) {
                                          renderedVal = '<a href="' + value + '" target="_blank">' + value +'</a>';
                                 }
                                 return renderedVal;
-                          },   
-                        filter: {type: 'string'}
+                          }
                         });
                         break;
                     case 3: //int
@@ -528,7 +529,7 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                             xtype: 'gridcolumn',
                             width: pramColumnWidth * parseInt(obj.size),
                             editor: 'textfield',
-                            filter: {type: 'numeric'}
+                            filter: {type: 'customnumericfilter'}
                         });
                         break;
                     default:
@@ -539,7 +540,7 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                             xtype: 'gridcolumn',
                             width: pramColumnWidth * parseInt(obj.size),
                             editor: 'textfield',
-                            filter: {type: 'string'}
+                            filter: {type: 'customstringfilter'}
                         });
                 }
                 fieldsConfig.push(field);
@@ -1041,6 +1042,7 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
     init: function (config)
     {
+        amdaUI.CustomFilters.init();
         var me = this;
         this.object = config.object;
         this.fieldName = new Ext.form.field.Text({
@@ -0,0 +1,40 @@
+// File: CustomFilters.js
+
+Ext.define('amdaUI.CustomFilters', {
+    singleton: true, // Ensure only one instance is created
+
+    init: function () {
+        this.initCustomFilter('Numeric', 'NumericFilter', 'numericfilter');
+        this.initCustomFilter('Date', 'DateFilter', 'datefilter');
+        this.initCustomFilter('String', 'StringFilter', 'stringfilter');
+    },
+
+    initCustomFilter: function (filterName, filterClass, aliasSuffix) {
+        Ext.define('amdaUI.Custom' + filterName + 'Filter', {
+            extend: 'Ext.ux.grid.filter.' + filterClass,
+            alias: 'gridfilter.custom' + aliasSuffix,
+
+            helpTitle: 'Help on ' + filterName + ' filter',
+            helpFile: 'catalogTTFilterHelp',
+
+            init: function () {
+                var me = this;
+                this.callParent(); // Ensure parent initialization
+
+                // Add custom help menu item
+                this.menu.add(Ext.create('Ext.menu.Item', {
+                    text: 'Help on filters',
+                    iconCls: 'icon-help',
+                    listeners: {
+                        click: function (item, e, eOpts) {
+                            myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.info.id, true, function (module) {
+                                module.createWindow(me.helpFile, me.helpTitle);
+                            });
+                        }
+                    }
+                }));
+            }
+        });
+    }
+});
+
@@ -16,6 +16,7 @@ Ext.define(&#39;amdaUI.TimeTableUI&#39;, {
         'Ext.ux.grid.FiltersFeature',
         'Ext.ux.grid.filter.DateFilter',
         'Ext.ux.grid.filter.NumericFilter',
+        'amdaUI.CustomFilters',
         'amdaUI.OperationsTT',
         'amdaUI.StatisticalPlug',
         'amdaUI.DescriptionField',
@@ -399,6 +400,7 @@ Ext.define(&#39;amdaUI.TimeTableUI&#39;, {
     init: function (config)
     {
+        amdaUI.CustomFilters.init();
         this.object = config.object;
         this.fieldName = new Ext.form.field.Text({
@@ -508,12 +510,12 @@ Ext.define(&#39;amdaUI.TimeTableUI&#39;, {
             encode: true, // json encode the filter query
             local: false, // defaults to false (remote filte
             filters: [
-                {type: 'numeric', dataIndex: 'durationDay'},
-                {type: 'numeric', dataIndex: 'durationHour'},
-                {type: 'numeric', dataIndex: 'durationMin'},
-                {type: 'numeric', dataIndex: 'durationSec'},
-                {type: 'date', dataIndex: 'start', dateFormat: 'c'},
-                {type: 'date', dataIndex: 'stop', dateFormat: 'c'}
+                {type: 'customnumericfilter', dataIndex: 'durationDay'},
+                {type: 'customnumericfilter', dataIndex: 'durationHour'},
+                {type: 'customnumericfilter', dataIndex: 'durationMin'},
+                {type: 'customnumericfilter', dataIndex: 'durationSec'},
+                {type: 'customdatefilter', dataIndex: 'start', dateFormat: 'c'},
+                {type: 'customdatefilter', dataIndex: 'stop', dateFormat: 'c'}
             ]
         };
         var cellEditing = Ext.create('Ext.grid.plugin.CellEditing', {
@@ -47,9 +47,9 @@ class CatalogCacheFilterPartObject extends TimeTableCacheFilterPartObject
 				$param_value = floatval($params[$this->paramId]);
 				switch ($this->op) {
 					case self::$OPERATION_LT :
-						return ($param_value < $this->value);
-					case self::$OPERATION_GT :
 						return ($param_value > $this->value);
+					case self::$OPERATION_GT :
+						return ($param_value < $this->value);
 					case self::$OPERATION_EQ :
 						return ($param_value != $this->value);
 					default :
@@ -62,9 +62,9 @@ class CatalogCacheFilterPartObject extends TimeTableCacheFilterPartObject
 				$param_value = intval($params[$this->paramId]);
 				switch ($this->op) {
 					case self::$OPERATION_LT :
-						return ($param_value < $this->value);
-					case self::$OPERATION_GT :
 						return ($param_value > $this->value);
+					case self::$OPERATION_GT :
+						return ($param_value < $this->value);
 					case self::$OPERATION_EQ :
 						return (!(($param_value >= $this->value) && ($param_value <= $this->value+86400)));
 					default :
@@ -84,9 +84,9 @@ class CatalogCacheFilterPartObject extends TimeTableCacheFilterPartObject
 				$param_value = intval($params[$this->paramId]);
 				switch ($this->op) {
 					case self::$OPERATION_LT :
-						return ($param_value < $this->value);
-					case self::$OPERATION_GT :
 						return ($param_value > $this->value);
+					case self::$OPERATION_GT :
+						return ($param_value < $this->value);
 					case self::$OPERATION_EQ :
 						return ($param_value != $this->value);
 					default :