From 3d9f783f453f6b2040160b0dd9a322c159d7b46d Mon Sep 17 00:00:00 2001
From: Furkan <furkan.erdogan1205@gmail.com>
Date: Tue, 20 Feb 2024 10:17:44 +0000
Subject: [PATCH] Some more modification
---
js/app/views/CatalogUI.js | 3 ---
js/app/views/TimeTableUI.js | 14 ++++++++------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/js/app/views/CatalogUI.js b/js/app/views/CatalogUI.js
index 362fb8d..763b65f 100644
--- a/js/app/views/CatalogUI.js
+++ b/js/app/views/CatalogUI.js
@@ -17,9 +17,6 @@ Ext.define('amdaUI.CatalogUI', {
'Ext.ux.grid.filter.DateFilter',
'Ext.ux.grid.filter.NumericFilter',
'Ext.ux.grid.filter.StringFilter',
- // 'amdaUI.CustomNumericFilter',
- // 'amdaUI.CustomStringFilter',
- // 'amdaUI.CustomDateFilter',
'amdaUI.CustomFilters',
'amdaUI.OperationsTT',
'amdaUI.DescriptionField',
diff --git a/js/app/views/TimeTableUI.js b/js/app/views/TimeTableUI.js
index f3e33fc..21e274c 100755
--- a/js/app/views/TimeTableUI.js
+++ b/js/app/views/TimeTableUI.js
@@ -16,6 +16,7 @@ Ext.define('amdaUI.TimeTableUI', {
'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('amdaUI.TimeTableUI', {
init: function (config)
{
+ amdaUI.CustomFilters.init();
this.object = config.object;
this.fieldName = new Ext.form.field.Text({
@@ -508,12 +510,12 @@ Ext.define('amdaUI.TimeTableUI', {
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', {
--
libgit2 0.21.2